Fix installation of keystore2_key_contexts files
system_ext, product, and vendor keystore2_key_contexts are not installed
correctly, due to missing REQUIRED dependencies and typo.
Bug: 338684892
Test: build and check each partition
Change-Id: Ic18bf05609d27c322375baf6b72f5e2c75c1bfa0
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 \
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,