IVGCVSW-7113 Fix building nn driver failed in our Android OOBT
* Android.bp file gets picked up by older Android versions so
rename it to "switch it off" and update guide on how to enable it
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1fc59a0d0dc2e6ce9cdc19f94b0b34d08d414351
diff --git a/shim/Android.bp b/shim/Android.bp.off
similarity index 98%
rename from shim/Android.bp
rename to shim/Android.bp.off
index 7e0d62a..f3810da 100644
--- a/shim/Android.bp
+++ b/shim/Android.bp.off
@@ -90,7 +90,7 @@
cc_binary {
name: "android.hardware.neuralnetworks-shim-service-armnn",
srcs: ["./shimservice.cpp"],
- enabled: false,
+ enabled: true,
defaults: ["NeuralNetworksShimArmnnDriverAidl_server_defaults"],
init_rc: ["./config/android.hardware.neuralnetworks-shim-service-armnn.rc"],
vintf_fragments: ["./config/android.hardware.neuralnetworks-shim-service-armnn.xml"],
diff --git a/shim/BuildGuideShimSupportLibrary.md b/shim/BuildGuideShimSupportLibrary.md
index dc69f8f..c0b0f85 100644
--- a/shim/BuildGuideShimSupportLibrary.md
+++ b/shim/BuildGuideShimSupportLibrary.md
@@ -141,10 +141,13 @@
## Build Arm NN Shim
-By default the Arm NN shim Android.bp is not enabled.
-Enable it by editing armnn/shim/Android.bp and setting `enabled: true`
+By default the Arm NN shim Android.bp.off is not enabled.
+It is enabled below by renaming it to Android.bp
```bash
+cd ${WORKING_DIR}/armnn/shim
+mv Android.bp.off Android.bp
+
cd $AOSP_ROOT
source build/envsetup.sh
lunch <device>-eng