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: I009f72cee5961769159e68ea2e670e64932c3f13
This commit is contained in:
parent
3dddbe8994
commit
d97e70b339
3 changed files with 0 additions and 17 deletions
|
@ -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,8 +199,6 @@ 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 \
|
||||
|
@ -966,9 +964,6 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
|
||||
|
||||
# ARM NN files
|
||||
ARMNN_COMPUTE_CL_ENABLE := 1
|
||||
|
||||
# Vibrator Diag
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
diag-vibrator \
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
|
||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/
|
Loading…
Add table
Add a link
Reference in a new issue