diff options
| author | Renato Grottesi <otaner@google.com> | 2023-07-14 12:32:39 +0000 |
|---|---|---|
| committer | Renato Grottesi <otaner@google.com> | 2023-07-14 12:32:55 +0000 |
| commit | 230b5846c7f5d4c0c36603e93858c576af5745a6 (patch) | |
| tree | 389d2f3e91b2e4ef63f518c9e0a713a0a92273de | |
| parent | 2898891cb509e9fe1c76100483d85a67ca13c357 (diff) | |
| download | zuma-230b5846c7f5d4c0c36603e93858c576af5745a6.tar.gz | |
Remove settings for old ArmNN HIDL backend
Compile ArmNN shim over the support library.
Remove SELinux permissions and settings for the old HIDL backend.
The AIDL settings will be in the gs-common folder.
Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Merged-In: I57f807934ca219460a4e589b899f933115718a70
Change-Id: Ica6a25f270a499670f23ba5452903c4904f37d48
| -rw-r--r-- | BoardConfig-common.mk | 10 | ||||
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | device_framework_matrix_product.xml | 8 | ||||
| -rw-r--r-- | manifest.xml | 10 |
4 files changed, 1 insertions, 29 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2ddc193..55befa8 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -358,16 +358,6 @@ BOARD_VNDK_VERSION := current # H/W align restriction of MM IPs BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 -# NeuralNetworks -GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall) -GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zuma/prebuilts/gpu) -ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT))) -ARMNN_COMPUTE_CL_ENABLE := 1 -else -ARMNN_COMPUTE_CL_ENABLE := 0 -endif -ARMNN_COMPUTE_NEON_ENABLE := 1 - # Boot.img BOARD_RAMDISK_USE_LZ4 := true #BOARD_KERNEL_BASE := 0x80000000 @@ -244,7 +244,7 @@ PRODUCT_SOONG_NAMESPACES += \ $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,arm_gralloc,soc,$(TARGET_BOARD_PLATFORM)) -include device/google/gs101/neuralnetwork/neuralnetwork.mk +include device/google/gs-common/gpu/gpu.mk PRODUCT_PACKAGES += \ csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \ diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 0c1cf73..9e7a747 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -16,14 +16,6 @@ </interface> </hal> <hal format="hidl" optional="true"> - <name>android.hardware.neuralnetworks</name> - <version>1.3</version> - <interface> - <name>IDevice</name> - <instance>google-armnn</instance> - </interface> - </hal> - <hal format="hidl" optional="true"> <name>android.hardware.radio</name> <version>1.2</version> <interface> diff --git a/manifest.xml b/manifest.xml index 73f1bf0..75ab11c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -13,16 +13,6 @@ <transport>hwbinder</transport> <fqname>@1.2::IBootControl/default</fqname> </hal> - <hal format="hidl"> - <name>android.hardware.neuralnetworks</name> - <transport>hwbinder</transport> - <version>1.3</version> - <interface> - <name>IDevice</name> - <instance>google-armnn</instance> - </interface> - <fqname>@1.3::IDevice/google-armnn</fqname> - </hal> <hal format="aidl"> <name>com.google.input.algos.spd</name> <version>2</version> |