diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-20 23:01:45 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-20 23:01:45 +0000 |
| commit | 21bf52268fa081c0dc125807e7e267a71bf3f95d (patch) | |
| tree | e37d437d9ab7a692b0fc796f6132e9f886fdf8e9 | |
| parent | ea2e254ad1f66804f8ff16475f48406a19d19012 (diff) | |
| parent | 185f37252989d6aaaed5083f32ce9960e8f28fa2 (diff) | |
| download | gs101-21bf52268fa081c0dc125807e7e267a71bf3f95d.tar.gz | |
Snap for 10535824 from 185f37252989d6aaaed5083f32ce9960e8f28fa2 to udc-d1-release
Change-Id: Ia3282c0081aab6765014630cdf84377efe596386
| -rw-r--r-- | BoardConfig-common.mk | 10 | ||||
| -rw-r--r-- | device.mk | 2 | ||||
| -rw-r--r-- | manifest.xml | 10 | ||||
| -rw-r--r-- | manifest_64.xml | 10 | ||||
| -rw-r--r-- | neuralnetwork/neuralnetwork.mk | 2 |
5 files changed, 1 insertions, 33 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 7883c20c..70e9d648 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -321,16 +321,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/gs101/prebuilts/gpu/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 @@ -199,7 +199,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 += \ libGLES_mali \ diff --git a/manifest.xml b/manifest.xml index 20ee97b5..19775bc8 100644 --- a/manifest.xml +++ b/manifest.xml @@ -35,16 +35,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> diff --git a/manifest_64.xml b/manifest_64.xml index ed6b03b4..b409b72f 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -23,16 +23,6 @@ <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="hidl"> <name>android.hardware.neuralnetworks</name> <transport>hwbinder</transport> <fqname>@1.3::IDevice/google-edgetpu</fqname> diff --git a/neuralnetwork/neuralnetwork.mk b/neuralnetwork/neuralnetwork.mk deleted file mode 100644 index 1533d2a6..00000000 --- a/neuralnetwork/neuralnetwork.mk +++ /dev/null @@ -1,2 +0,0 @@ -PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/ |