From ed673496c2eabdd772ea4bedfc299f26040070cb Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Fri, 16 Sep 2022 20:54:03 +0900 Subject: [PATCH] Explicitly install RemoteProvisioner for keymint This is effectively a no-op change; both packages are installed. However, removing required and moving it to PRODUCT_PACKAGES cuts the dependency from vendor modules to system-ext modules. This is needed for vendor-only build test. Test: build and see both packages are installed Change-Id: I6620020a1eccfab08594c9be3b298611bd237f1d --- trusty/keymaster/Android.bp | 1 - trusty/trusty-base.mk | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp index 0e916ef37..adc9fdffb 100644 --- a/trusty/keymaster/Android.bp +++ b/trusty/keymaster/Android.bp @@ -123,7 +123,6 @@ cc_binary { ], required: [ "android.hardware.hardware_keystore.xml", - "RemoteProvisioner", ], } diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk index d40a59e36..06097091d 100644 --- a/trusty/trusty-base.mk +++ b/trusty/trusty-base.mk @@ -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 \