From 1e7f912b51fcc215eda597a852d42395fbffef38 Mon Sep 17 00:00:00 2001 From: Hyunki Koo Date: Mon, 17 May 2021 21:50:59 +0900 Subject: [PATCH] BoardConfig-common.mk Bug: 186836335 Signed-off-by: Hyunki Koo Change-Id: Id3f575d31fa32303207ac2a424d7543c45508cfc --- BoardConfig-common.mk | 2 +- device.mk | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f0576c0a..0851375b 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -93,7 +93,7 @@ BOARD_USES_ALIGN_RESTRICTION := false BOARD_USES_GRALLOC_ION_SYNC := true # This should be the same value as USE_SWIFTSHADER in device.mk -BOARD_USES_SWIFTSHADER := false +BOARD_USES_SWIFTSHADER := true # Gralloc4 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4) diff --git a/device.mk b/device.mk index ea150bda..da7c0843 100644 --- a/device.mk +++ b/device.mk @@ -139,7 +139,7 @@ USES_GAUDIO := true endif # This should be the same value as BOARD_USES_SWIFTSHADER in BoardConfig.mk -USE_SWIFTSHADER := false +USE_SWIFTSHADER := true ifeq ($(USE_SWIFTSHADER),true) PRODUCT_PROPERTY_OVERRIDES += \ @@ -739,20 +739,22 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ init.gps_log.rc +ifneq ($(DEVICE_USES_NO_TRUSTY), true) # Trusty (KM, GK, Storage) -$(call inherit-product, system/core/trusty/trusty-storage.mk) -$(call inherit-product, system/core/trusty/trusty-base.mk) +#$(call inherit-product, system/core/trusty/trusty-storage.mk) +#$(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty unit test tool -PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl +#PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl # Trusty ConfirmationUI HAL -PRODUCT_PACKAGES += \ +#PRODUCT_PACKAGES += \ android.hardware.confirmationui@1.0-service.trusty.vendor # Trusty Secure DPU Daemon -PRODUCT_PACKAGES += \ +#PRODUCT_PACKAGES += \ securedpud.slider +endif # Trusty Metrics Daemon PRODUCT_SOONG_NAMESPACES += \