commit 8945a42a1e637588da45cc40b6f662974bd91e6e
author Zhanglong Xia <zhanglongxia@google.com> Mon Sep 26 04:20:54 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 26 04:20:54 2022 +0000
tree ffb659f6168cc38b6aa9bc95761b58a6f04c603d
parent 3486f7bf4324ec98590b17d641eaae6df0df3176
parent 40e1666fb927717a8f6b60cfbff3c24f4dc65657

Merge "init.rc: create /data/misc/threadnetwork folder"

janitors/OWNERS

diff --git a/janitors/OWNERS b/janitors/OWNERS
index 3e32c26..e132f0b 100644
--- a/janitors/OWNERS
+++ b/janitors/OWNERS
@@ -2,5 +2,5 @@
 ccross@google.com
 dwillemsen@google.com
 enh@google.com
-hhb@google.com
 narayan@google.com
+sadafebrahimi@google.com
\ No newline at end of file

trusty/keymaster/Android.bp

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 0e916ef..adc9fdf 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -123,7 +123,6 @@
     ],
     required: [
         "android.hardware.hardware_keystore.xml",
-        "RemoteProvisioner",
     ],
 }
 

trusty/trusty-base.mk

diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk
index d40a59e..0609709 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 \