From 2697e86201128731e756f570c95b6afceacdb705 Mon Sep 17 00:00:00 2001
From: Renato Grottesi <otaner@google.com>
Date: Thu, 13 Jul 2023 08:40:59 +0000
Subject: [PATCH] Revert^2 "Remove settings for old ArmNN HIDL backend"

f41cbb6820177c8f389dd6fef4b2f17b9a23c3bd

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: I57f807934ca219460a4e589b899f933115718a70
---
 BoardConfig-common.mk | 10 ----------
 device.mk             |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 2ddc193e..55befa84 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -358,16 +358,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/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
 BOARD_RAMDISK_USE_LZ4     := true
 #BOARD_KERNEL_BASE        := 0x80000000
diff --git a/device.mk b/device.mk
index 84ebafe8..b07e8a3d 100644
--- a/device.mk
+++ b/device.mk
@@ -244,8 +244,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 \
@@ -986,9 +984,6 @@ PRODUCT_PACKAGES += \
 
 endif
 
-# ARM NN files
-ARMNN_COMPUTE_CL_ENABLE := 1
-
 # Vibrator Diag
 PRODUCT_PACKAGES_DEBUG += \
 	diag-vibrator \