diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 70e9d648..7883c20c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -321,6 +321,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/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 diff --git a/device.mk b/device.mk index 4a18cc1f..d62c3e19 100644 --- a/device.mk +++ b/device.mk @@ -199,6 +199,8 @@ 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 \ @@ -964,6 +966,9 @@ 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 \ diff --git a/neuralnetwork/neuralnetwork.mk b/neuralnetwork/neuralnetwork.mk new file mode 100644 index 00000000..1533d2a6 --- /dev/null +++ b/neuralnetwork/neuralnetwork.mk @@ -0,0 +1,2 @@ +PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/