commit 6ec694368365c8ed96c0995ed6f5e1af64c3cd9d
author Jeff Gaston <jeffrygaston@google.com> Thu Nov 30 00:20:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 30 00:20:38 2017 +0000
tree 150c753b96b80bff3f82fb81fca2958b333870b8
parent 65bee4ee78055f08f6074f53712048e62d03866c
parent 4db75cfb6369bd0ae337a6de851b4da85a8ef804

Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" am: 9ddf8ea3a5
am: 4db75cfb63

Change-Id: If3371fb160aea129e4a3c637389f231cc9fffcdc

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index c01a856..f15f6b3 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -102,6 +102,7 @@
     PRODUCT_SDK_ADDON_COPY_MODULES \
     PRODUCT_SDK_ADDON_DOC_MODULES \
     PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP \
+    PRODUCT_SOONG_NAMESPACES \
     PRODUCT_DEFAULT_WIFI_CHANNELS \
     PRODUCT_DEFAULT_DEV_CERTIFICATE \
     PRODUCT_RESTRICT_VENDOR_FILES \

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 4e2d5ae..5b0e257 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -480,3 +480,7 @@
 # Whether any paths should have CFI enabled for components
 PRODUCT_CFI_INCLUDE_PATHS := \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CFI_INCLUDE_PATHS))
+
+# which Soong namespaces to export to Make
+PRODUCT_SOONG_NAMESPACES :=
+    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SOONG_NAMESPACES))

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index a90e5af..6f5ca4e 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -121,6 +121,8 @@
 
 $(call add_json_str,  DistDir,                           $(if $(dist_goal), $(DIST_DIR)))
 
+$(call add_json_list, NamespacesToExport,                $(PRODUCT_SOONG_NAMESPACES))
+
 _contents := $(subst $(comma)$(newline)__SV_END,$(newline)}$(newline),$(_contents)__SV_END)
 
 $(file >$(SOONG_VARIABLES).tmp,$(_contents))