Snap for 10535291 from 88182691e5 to udc-qpr1-release

Change-Id: Id124c68ff0a0f45376670e821e8b9f5bc54770c1
This commit is contained in:
Android Build Coastguard Worker 2023-07-20 23:02:29 +00:00
commit 247ab3cc90
6 changed files with 2 additions and 34 deletions

View file

@ -321,16 +321,6 @@ BOARD_VNDK_VERSION := current
# H/W align restriction of MM IPs # H/W align restriction of MM IPs
BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 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 # Boot.img
BOARD_RAMDISK_USE_LZ4 := true BOARD_RAMDISK_USE_LZ4 := true
#BOARD_KERNEL_BASE := 0x80000000 #BOARD_KERNEL_BASE := 0x80000000

View file

@ -199,7 +199,7 @@ PRODUCT_SOONG_NAMESPACES += \
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) $(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 += \ PRODUCT_PACKAGES += \
libGLES_mali \ libGLES_mali \

View file

@ -58,7 +58,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>com.google.face.debug</name> <name>com.google.face.debug</name>
<version>3</version> <version>4</version>
<interface> <interface>
<name>IDebugHost</name> <name>IDebugHost</name>
<instance>default</instance> <instance>default</instance>

View file

@ -35,16 +35,6 @@
<transport>hwbinder</transport> <transport>hwbinder</transport>
<fqname>@1.2::IBootControl/default</fqname> <fqname>@1.2::IBootControl/default</fqname>
</hal> </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"> <hal format="aidl">
<name>com.google.input.algos.spd</name> <name>com.google.input.algos.spd</name>
<interface> <interface>

View file

@ -22,16 +22,6 @@
<transport>hwbinder</transport> <transport>hwbinder</transport>
<fqname>@1.2::IBootControl/default</fqname> <fqname>@1.2::IBootControl/default</fqname>
</hal> </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"> <hal format="hidl">
<name>android.hardware.neuralnetworks</name> <name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>

View file

@ -1,2 +0,0 @@
PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/