modulize hal_neuralnetwork_armnn
Bug: 189895314
Bug: 171160755
Bug: 171670122
Bug: 180858476
Test: make sure all affected devices' armnn module has the right label
Change-Id: Ie618a5477b4e447774b20a58c9f091ae9fe529d6
diff --git a/device.mk b/device.mk
index 1d6bb2d..d783465 100644
--- a/device.mk
+++ b/device.mk
@@ -145,11 +145,12 @@
vendor/arm/mali/valhall/libmali \
vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader
+include device/google/gs101/neuralnetwork/neuralnetwork.mk
+
PRODUCT_PACKAGES += \
libGLES_mali \
vulkan.gs101 \
libOpenCL \
- android.hardware.neuralnetworks@1.3-service-armnn \
libgpudataproducer
ifeq ($(USE_SWIFTSHADER),true)
diff --git a/neuralnetwork/neuralnetwork.mk b/neuralnetwork/neuralnetwork.mk
new file mode 100644
index 0000000..1533d2a
--- /dev/null
+++ b/neuralnetwork/neuralnetwork.mk
@@ -0,0 +1,2 @@
+PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/