Merge "Remove settings for old ArmNN HIDL backend" into udc-d1-dev
This commit is contained in:
commit
18dd617a65
4 changed files with 1 additions and 29 deletions
|
@ -358,16 +358,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/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
|
# Boot.img
|
||||||
BOARD_RAMDISK_USE_LZ4 := true
|
BOARD_RAMDISK_USE_LZ4 := true
|
||||||
#BOARD_KERNEL_BASE := 0x80000000
|
#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,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
|
||||||
$(call soong_config_set,arm_gralloc,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 += \
|
PRODUCT_PACKAGES += \
|
||||||
csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
|
csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
|
||||||
|
|
|
@ -15,14 +15,6 @@
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</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">
|
<hal format="hidl" optional="true">
|
||||||
<name>android.hardware.radio</name>
|
<name>android.hardware.radio</name>
|
||||||
<version>1.2</version>
|
<version>1.2</version>
|
||||||
|
|
10
manifest.xml
10
manifest.xml
|
@ -13,16 +13,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>
|
||||||
<version>2</version>
|
<version>2</version>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue