Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Remove settings for old ArmNN HIDL backend"

Browse source 
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: I81b40e12be7178abaa7991dfecd2f7dbb5ebd48e
This commit is contained in:
Android Culprit Assistant 2023-07-12 20:43:46 +00:00 • committed by Android (Google) Code Review
parent 27a7859bb1
commit f41cbb6820
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BoardConfig-common.mk
View file

@ -358,6 +358,16 @@ BOARD_VNDK_VERSION := current
# H/W align restriction of MM IPs # H/W align restriction of MM IPs
BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 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 # Boot.img
BOARD_RAMDISK_USE_LZ4 := true BOARD_RAMDISK_USE_LZ4 := true
#BOARD_KERNEL_BASE := 0x80000000 #BOARD_KERNEL_BASE := 0x80000000

5
device.mk
View file

@ -244,6 +244,8 @@ PRODUCT_SOONG_NAMESPACES += \
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
$(call soong_config_set,arm_gralloc,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 include device/google/gs-common/gpu/gpu.mk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \ csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
@ -984,6 +986,9 @@ PRODUCT_PACKAGES += \
endif endif
# ARM NN files
ARMNN_COMPUTE_CL_ENABLE := 1
# Vibrator Diag # Vibrator Diag
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
diag-vibrator \ diag-vibrator \