Revert "Organize citadel's setting" Revert "Organize citadel's setting and fastboot lib" Revert "Organize citadel's setting" Revert "Organize citadel's setting" Revert "Organize citadel's setting" Revert "Organize citadel's setting and fastboot lib" Revert "iOrganize citadel's setting" Revert submission 12945656-ORGANIZE_CITADEL_LIB_AND_FASTBOOTD Reason for revert: Device boot tests failing. Reverted Changes: Ieb1cf8cb6:Organize citadel's setting I8c965ff88:Organize citadel's setting and fastboot lib Ia472d7812:Organize citadel's setting Id922447dd:iOrganize citadel's setting I4e05236c0:Organize citadel's setting I8fea8a68c:Organize citadel's setting and fastboot lib I63c732ead:fastbootd: allow fastbootd to access citadel I379e9a717:fastboot: Include fastbootd and lib in pixel-commo... I46a30449a:fastboot: Use doOemSpecificErase() to erase Titan ... I6cded2df5:Organize citadel's setting and fastboot lib I388675440:Organize citadel's setting and fastboot lib Iec10ebc27:Organize citadel's setting I51d6db226:Organize citadel's setting I44c4a232e:Organize citadel's setting I8ef83954e:Organize citadel's setting I72ae3f968:Organize citadel's setting Ia3dbac300:Organize citadel's setting I2c9ff026a:Organize citadel's setting I50a6764e1:Organize citadel's setting Bug: 172063886 Change-Id: I3feed2d50411c3fc7978786e17b3793cfa881098
diff --git a/device.mk b/device.mk index 05d1326..237717a 100644 --- a/device.mk +++ b/device.mk
@@ -708,6 +708,20 @@ PRODUCT_PACKAGES += \ android.hardware.dumpstate@1.1-service.sunfish +# Citadel +PRODUCT_PACKAGES += \ + citadeld \ + citadel_updater \ + android.hardware.authsecret@1.0-service.citadel \ + android.hardware.oemlock@1.0-service.citadel \ + android.hardware.weaver@1.0-service.citadel \ + android.hardware.keymaster@4.1-service.citadel \ + android.hardware.identity@1.0-service.citadel \ + wait_for_strongbox + +# Citadel debug stuff +PRODUCT_PACKAGES_DEBUG += \ + test_citadel # Storage: for factory reset protection feature PRODUCT_PROPERTY_OVERRIDES += \ @@ -826,6 +840,11 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true +# fastbootd +PRODUCT_PACKAGES += \ + android.hardware.fastboot@1.0-impl.pixel \ + fastbootd + # insmod files PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init.insmod.sunfish.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.sunfish.cfg @@ -853,6 +872,10 @@ PRODUCT_PACKAGES += \ android.hardware.power.stats@1.0-service.pixel +# Resume on Reboot support +PRODUCT_PACKAGES += \ + android.hardware.rebootescrow-service.citadel + # Recovery PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init.recovery.device.rc:recovery/root/init.recovery.sunfish.rc @@ -895,9 +918,6 @@ # Project include hardware/google/pixel/common/pixel-common-device.mk -# Citadel -include hardware/google/pixel/citadel/citadel.mk - # Factory OTA -include vendor/google/factoryota/client/factoryota.mk