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

Enable HW encryption w/ Trusty

Browse source 
Bug: 214136017
Bug: 214135924
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Id38edc06ad58de8eefee7619077ddd753d9804cb
This commit is contained in:
Jaegeuk Kim 2022-08-30 14:46:25 -07:00
parent 7949921501
commit be913ec40e
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
conf/Android.bp
View file

@ -60,10 +60,9 @@ genrule {
" -e s/@metadata_encryption@/aes-256-xts/ $(in) > $(out)",
}
// TODO: change below to gen_fstab.zuma-hw-encrypt once GSA is ready
prebuilt_etc {
name: "fstab.zuma",
src: ":gen_fstab.zuma-sw-encrypt",
src: ":gen_fstab.zuma-hw-encrypt",
vendor: true,
vendor_ramdisk_available: true,
}

18
device.mk
View file

@ -761,20 +761,9 @@ PRODUCT_PACKAGES += \
libopenvx-opencl
endif
# TODO[b/XXXX]: Re-enable Trusty and disable this when Trusty is working
PRODUCT_PACKAGES += \
android.hardware.keymaster@4.1-service \
android.hardware.gatekeeper@1.0-service.remote
# 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
LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.remote
# 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 \
@ -1120,5 +1109,8 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
frameworks/native/data/etc/android.hardware.device_unique_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.device_unique_attestation.xml
# Call deleteAllKeys if vold detects a factory reset
PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=true
# Hardware Info Collection
include hardware/google/pixel/HardwareInfo/HardwareInfo.mk