StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export PRODUCT_SOONG_NAMESPACES to Soong

Browse Source 
Bug: 65683273
Test: put 'PRODUCT_SOONG_NAMESPACES := jeff-test/dir1' \
      in a .mk file and observe its value copied into \
      out/soong/soong.variables

Change-Id: I2b61caa46f40f35ccecf64da88918b73180e02e8
This commit is contained in:
Jeff Gaston
2017-11-21 15:05:07 -08:00
parent ada8948b9a
commit 1fe28d332e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/product.mk
View File

@@ -102,6 +102,7 @@ _product_var_list := \
PRODUCT_SDK_ADDON_COPY_MODULES \ PRODUCT_SDK_ADDON_COPY_MODULES \
PRODUCT_SDK_ADDON_DOC_MODULES \ PRODUCT_SDK_ADDON_DOC_MODULES \
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP \ PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP \
PRODUCT_SOONG_NAMESPACES \
PRODUCT_DEFAULT_WIFI_CHANNELS \ PRODUCT_DEFAULT_WIFI_CHANNELS \
PRODUCT_DEFAULT_DEV_CERTIFICATE \ PRODUCT_DEFAULT_DEV_CERTIFICATE \
PRODUCT_RESTRICT_VENDOR_FILES \ PRODUCT_RESTRICT_VENDOR_FILES \

4
core/product_config.mk
View File

@@ -480,3 +480,7 @@ PRODUCT_CFI_EXCLUDE_PATHS := \
# Whether any paths should have CFI enabled for components # Whether any paths should have CFI enabled for components
PRODUCT_CFI_INCLUDE_PATHS := \ PRODUCT_CFI_INCLUDE_PATHS := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).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))

2
core/soong_config.mk
View File

@@ -121,6 +121,8 @@ $(call add_json_bool, UseGoma, $(filter-out false,$(US
$(call add_json_str, DistDir, $(if $(dist_goal), $(DIST_DIR))) $(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) _contents := $(subst $(comma)$(newline)__SV_END,$(newline)}$(newline),$(_contents)__SV_END)
$(file >$(SOONG_VARIABLES).tmp,$(_contents)) $(file >$(SOONG_VARIABLES).tmp,$(_contents))