From 71fb74e11a77808160d85ab492712d073ad266f4 Mon Sep 17 00:00:00 2001 From: Android Culprit Assistant Date: Wed, 12 Jul 2023 20:43:46 +0000 Subject: [PATCH] Revert "Remove settings for old ArmNN HIDL backend" This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/123b2665-83ef-4fd0-904d-a0d8c5782db9). Change-Id: I261a9acae68e6b6c5714cca16a85fa7fbc3abebf --- BoardConfig-common.mk | 10 ++++++++++ device.mk | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index d2d094a..c5c186b 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -354,6 +354,16 @@ 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 diff --git a/device.mk b/device.mk index b369ceb..4a4c4c8 100644 --- a/device.mk +++ b/device.mk @@ -230,6 +230,8 @@ 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 \ @@ -972,6 +974,9 @@ 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 \