commit dbb31be41302aa4426006685e9c652de8074906a
author Ying Wang <wangying@google.com> Fri Dec 09 15:11:57 2011 -0800
committer Ying Wang <wangying@google.com> Mon Dec 12 14:17:55 2011 -0800
tree 766f0860e64415508de9e2dd5569572b9f5e515e
parent d2972716be3435771833972981b6225abb6ccdc0

Restrict vendor modules to help AOSP product distribution.

Bug: 5692177

If you set "PRODUCT_RESTRICT_VENDOR_FILES := true" in a product
configuration, this changes restricts that:
- No overlays in the vendor tree.
- No PRODUCT_COPY_FILES coming from the vendor tree.
- Any referenced package with Android.mk in the vendor tree must have
  LOCAL_MODULE_OWNER set to a value that's compared against a whitelist
  stored in the core build system.

Change-Id: I172b84c7c853e9a04bf9879ea8dec90bd5054230

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 242b53d..792b21a 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -587,6 +587,10 @@
     $(ALL_MODULES.$(LOCAL_MODULE).EVENT_LOG_TAGS) $(event_log_tags)
 ALL_MODULES.$(LOCAL_MODULE).INTERMEDIATE_SOURCE_DIR := \
     $(ALL_MODULES.$(LOCAL_MODULE).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)
+ifdef LOCAL_MODULE_OWNER
+ALL_MODULES.$(LOCAL_MODULE).OWNER := \
+    $(strip $(ALL_MODULES.$(LOCAL_MODULE).OWNER) $(LOCAL_MODULE_OWNER))
+endif
 
 INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(LOCAL_MODULE)