Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e00ad63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc155 am:... 

Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc155 am: b9461997 am: a7070f99

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544



Change-Id: I03b3c529cc628b77251bededd33986fbadec4f8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce2afe18 a7070f99

trusty/keymaster/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ cc_binary { 
    ],

    required: [

        "android.hardware.hardware_keystore.xml",

        "RemoteProvisioner",

    ],

}

trusty/trusty-base.mk

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ 
PRODUCT_PACKAGES += \

	android.hardware.security.keymint-service.trusty \

	android.hardware.gatekeeper@1.0-service.trusty \

	trusty_apploader

	trusty_apploader \

	RemoteProvisioner



PRODUCT_PROPERTY_OVERRIDES += \

	ro.hardware.keystore_desede=true \