commit 75c6fe25a1ee1a14dd41dbb7416aa41b3660fdfd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 30 09:02:07 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 30 09:02:07 2024 +0000
tree 39129bdb51a0922e48c8553b8845a2680e99fc39
parent 7bd158dad2019a292200d0aa22f1533fc97d8506
parent 7904f2144e6e821e1da6816349ac76f4213f501a

Merge "Fix installation of keystore2_key_contexts files" into main

Android.mk

diff --git a/Android.mk b/Android.mk
index 6b30fb2..dc62833 100644
--- a/Android.mk
+++ b/Android.mk
@@ -288,6 +288,7 @@
 LOCAL_REQUIRED_MODULES += \
     system_ext_file_contexts \
     system_ext_file_contexts_test \
+    system_ext_keystore2_key_contexts \
     system_ext_hwservice_contexts \
     system_ext_hwservice_contexts_test \
     system_ext_property_contexts \
@@ -336,6 +337,7 @@
 LOCAL_REQUIRED_MODULES += \
     product_file_contexts \
     product_file_contexts_test \
+    product_keystore2_key_contexts \
     product_hwservice_contexts \
     product_hwservice_contexts_test \
     product_property_contexts \
@@ -384,6 +386,7 @@
 LOCAL_REQUIRED_MODULES += \
     vendor_file_contexts \
     vendor_file_contexts_test \
+    vendor_keystore2_key_contexts \
     vendor_mac_permissions.xml \
     vendor_property_contexts \
     vendor_property_contexts_test \

contexts/Android.bp

diff --git a/contexts/Android.bp b/contexts/Android.bp
index 464c772..ca3cf57 100644
--- a/contexts/Android.bp
+++ b/contexts/Android.bp
@@ -315,7 +315,7 @@
 }
 
 keystore2_key_contexts {
-    name: "system_keystore2_key_contexts",
+    name: "system_ext_keystore2_key_contexts",
     defaults: ["contexts_flags_defaults"],
     srcs: [":keystore2_key_contexts_files{.system_ext_private}"],
     system_ext_specific: true,