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

Disable GSC/Trusty/UFS encryption for bringup

Browse source 
Get 6.1 to home again
Bug: 279647242

Change-Id: I89ecb49eb62df10e4bdae4911cb2bf9051d98f4b
This commit is contained in:
Andrew Chant 2023-04-25 14:31:31 -07:00
parent d3163b9b33
commit d091e65638
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/Android.bp
View file

@ -71,7 +71,7 @@ genrule {
prebuilt_etc { prebuilt_etc {
name: "fstab.zumapro", name: "fstab.zumapro",
src: ":gen_fstab.zumapro-hw-encrypt", src: ":gen_fstab.zumapro-no-encrypt",
vendor: true, vendor: true,
vendor_ramdisk_available: true, vendor_ramdisk_available: true,
} }

13
device.mk
View file

@ -596,7 +596,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
# Titan-M # Titan-M
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include device/google/gs-common/dauntless/gsc.mk #include device/google/gs-common/dauntless/gsc.mk
endif endif
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
@ -796,9 +796,16 @@ PRODUCT_PACKAGES += \
libopenvx-opencl libopenvx-opencl
endif endif
# TODO[b/279647242]: Re-enable Trusty and disable this when Trusty is working
PRODUCT_PACKAGES += \
android.hardware.keymaster@4.1-service \
android.hardware.gatekeeper@1.0-service.software
LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service
LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.software
# Trusty (KM, GK, Storage) # Trusty (KM, GK, Storage)
$(call inherit-product, system/core/trusty/trusty-storage.mk) #$(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-base.mk)
# Trusty unit test tool # Trusty unit test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \