Update cuttlefish to use 1.3 NNAPI sample drivers
Bug: 139120468
Test: m
Change-Id: I3183bdf88c09792d4f29abe37867e4eca26b9ce7
Merged-In: I3183bdf88c09792d4f29abe37867e4eca26b9ce7
(cherry picked from commit 6a4eca1095970a5a07ba8f3e8827ceb972521392)
diff --git a/shared/device.mk b/shared/device.mk
index e626c86..cd64ef5 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -307,11 +307,11 @@
# NeuralNetworks HAL
#
PRODUCT_PACKAGES += \
- android.hardware.neuralnetworks@1.2-service-sample-all \
- android.hardware.neuralnetworks@1.2-service-sample-float-fast \
- android.hardware.neuralnetworks@1.2-service-sample-float-slow \
- android.hardware.neuralnetworks@1.2-service-sample-minimal \
- android.hardware.neuralnetworks@1.2-service-sample-quant
+ android.hardware.neuralnetworks@1.3-service-sample-all \
+ android.hardware.neuralnetworks@1.3-service-sample-float-fast \
+ android.hardware.neuralnetworks@1.3-service-sample-float-slow \
+ android.hardware.neuralnetworks@1.3-service-sample-minimal \
+ android.hardware.neuralnetworks@1.3-service-sample-quant
#
# USB
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index 69c5ad8..876e09a 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -60,7 +60,7 @@
/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0
/vendor/bin/hw/android\.hardware\.health@2\.0-service\.cuttlefish u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service\.cuttlefish u:object_r:hal_health_storage_default_exec:s0
-/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0
+/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator@1\.3-service\.example u:object_r:hal_vibrator_default_exec:s0
/vendor/bin/hw/android\.hardware\.tv\.cec@1\.0-service\.mock u:object_r:hal_tv_cec_mock_exec:s0
/vendor/bin/ip_link_add u:object_r:ip_link_add_exec:s0
