summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author JaeMan Park <jaeman@google.com> 2020-12-02 16:34:12 +0900
committer JaeMan Park <jaeman@google.com> 2020-12-09 14:02:38 +0900
commit33d9aad0baa5c2154294eaa543b0cdec9e93d4d5 (patch)
tree430cc8dbffc60ebb6a0ac07b7764d7cad86f811f
parent254051146c27ca6abe4aeb4108e24a393135db20 (diff)
Add java_sdk_library enforcement flags to product.mk
Add flags that is used for java_sdk_library enforcement to product.mk. PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY is flag for enabling java_sdk_library enforcement. PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST is allowlist for java_sdk_library enforcement, and it is consists of name of dependency modules. Test: m nothing Bug: 168180538 Change-Id: I8743d9475be53b16f2c9e43d731c576bc56ddfbc
-rw-r--r--core/product.mk14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/product.mk b/core/product.mk
index 5f06141ef0..bfdeb8b17c 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -405,6 +405,20 @@ _product_single_value_vars += PRODUCT_OTA_FORCE_NON_AB_PACKAGE
# If set, Java module in product partition cannot use hidden APIs.
_product_single_value_vars += PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE
+# If set, only java_sdk_library can be used at inter-partition dependency.
+# Note: Build error if BOARD_VNDK_VERSION is not set while
+# PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY is true, because
+# PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY has no meaning if
+# BOARD_VNDK_VERSION is not set.
+# Note: When PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE is not set, there are
+# no restrictions at dependency between system and product partition.
+_product_single_value_vars += PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY
+
+# Allowlist for PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY option.
+# Listed modules are allowed at inter-partition dependency even if it isn't
+# a java_sdk_library module.
+_product_list_vars += PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST
+
_product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
.KATI_READONLY := _product_single_value_vars _product_list_vars