Remove settings for old ArmNN HIDL backend
Compile ArmNN shim over the support library. Remove settings for the old HIDL backend. The new ones 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 Change-Id: I5f3d6a4930aa13374a9ddab9f5079f7618e7eb4b
This commit is contained in:
parent
8a0c690068
commit
438347e7fd
2 changed files with 0 additions and 15 deletions
|
@ -354,16 +354,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/zumapro/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
|
||||
|
|
|
@ -230,8 +230,6 @@ 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 \
|
||||
|
@ -974,9 +972,6 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/zumapro/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml
|
||||
endif
|
||||
|
||||
# ARM NN files
|
||||
ARMNN_COMPUTE_CL_ENABLE := 1
|
||||
|
||||
# Vibrator Diag
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
diag-vibrator \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue