diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-20 23:01:46 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-20 23:01:46 +0000 |
| commit | 42d57f8dc0b9ea6c7935bf7c19fb0398233f9c8b (patch) | |
| tree | 0cd33be45dfcbc45eb502ce10169e42edec95881 | |
| parent | 3603161592e6e1efc2111b84e57d4a1aa92bae56 (diff) | |
| parent | c0baa17abe8b71fa1f9cf2a8add066c6911c8d28 (diff) | |
| download | gs201-42d57f8dc0b9ea6c7935bf7c19fb0398233f9c8b.tar.gz | |
Snap for 10535824 from c0baa17abe8b71fa1f9cf2a8add066c6911c8d28 to udc-d1-release
Change-Id: Id0cdb02b2ec07a64e93907d20cca4a1cb7627ebe
| -rw-r--r-- | BoardConfig-common.mk | 10 | ||||
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | manifest-gralloc3.xml | 10 | ||||
| -rw-r--r-- | manifest.xml | 10 |
4 files changed, 1 insertions, 31 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f680441..723b6b6 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -352,16 +352,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/zebu/prebuilts/libs) -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 @@ -225,7 +225,7 @@ PRODUCT_SOONG_NAMESPACES += \ $(call soong_config_set,pixel_mali,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_todx_mali_csffw.bin \ diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index dc91529..0427aa5 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -83,16 +83,6 @@ </interface> </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="hidl"> <name>android.hardware.neuralnetworks</name> <transport>hwbinder</transport> <fqname>@1.3::IDevice/google-edgetpu</fqname> diff --git a/manifest.xml b/manifest.xml index 90af32b..b6e6396 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> <interface> |