Remove apex component from system.img whitelist
Updatable apex components are included in the mainline,
so no need to be whitelisted anymore
Bug: 135411991
Test: Built the following products successfully
$ lunch aosp_cf_x86_phone; m -j
$ lunch aosp_cf_x86_64_phone; m -j
$ lunch aosp_cf_arm64_phone; m -j
Change-Id: I4174877be873b91c0ee642e1c18472b6b689c1a7
diff --git a/vsoc_arm64/phone/aosp_cf.mk b/vsoc_arm64/phone/aosp_cf.mk
index 8ce225d..035a5c5 100644
--- a/vsoc_arm64/phone/aosp_cf.mk
+++ b/vsoc_arm64/phone/aosp_cf.mk
@@ -26,11 +26,6 @@
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-# TODO(ycchen): The component below will be in Q mainline, and will be removed
-# from the whitelist when Q is released. See b/131162245 for some details.
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
- system/apex/com.android.apex.cts.shim.apex \
-
#
# All components inherited here go to product image (same as GSI product)
#
diff --git a/vsoc_x86/pasan/aosp_cf.mk b/vsoc_x86/pasan/aosp_cf.mk
index d1e1566..a1e1abf 100644
--- a/vsoc_x86/pasan/aosp_cf.mk
+++ b/vsoc_x86/pasan/aosp_cf.mk
@@ -21,11 +21,6 @@
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-# TODO(ycchen): The component below will be in Q mainline, and will be removed
-# from the whitelist when Q is released. See b/131162245 for some details.
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
- system/apex/com.android.apex.cts.shim.apex \
-
#
# All components inherited here go to product image (same as GSI product)
#
diff --git a/vsoc_x86/phone/aosp_cf.mk b/vsoc_x86/phone/aosp_cf.mk
index ea48aee..7ed1407 100644
--- a/vsoc_x86/phone/aosp_cf.mk
+++ b/vsoc_x86/phone/aosp_cf.mk
@@ -21,11 +21,6 @@
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-# TODO(ycchen): The component below will be in Q mainline, and will be removed
-# from the whitelist when Q is released. See b/131162245 for some details.
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
- system/apex/com.android.apex.cts.shim.apex \
-
#
# All components inherited here go to product image (same as GSI product)
#
diff --git a/vsoc_x86_64/phone/aosp_cf.mk b/vsoc_x86_64/phone/aosp_cf.mk
index 2d5edb7..4e10a23 100644
--- a/vsoc_x86_64/phone/aosp_cf.mk
+++ b/vsoc_x86_64/phone/aosp_cf.mk
@@ -26,11 +26,6 @@
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-# TODO(ycchen): The component below will be in Q mainline, and will be removed
-# from the whitelist when Q is released. See b/131162245 for some details.
-PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
- system/apex/com.android.apex.cts.shim.apex \
-
#
# All components inherited here go to product image (same as GSI product)
#
