openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Export PRODUCT_SOONG_NAMESPACES to Soong" 

am: 9ddf8ea3a5

Change-Id: Ia3fe844259d7808477e286b68edbf51e29631e7d
This commit is contained in:
Jeff Gaston 2017-11-30 00:15:32 +00:00 committed by android-build-merger
parent 4b57c28908 9ddf8ea3a5
commit 4db75cfb63
3 changed files with 7 additions and 0 deletions
Show Stats 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_DOC_MODULES \
PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP \
PRODUCT_SOONG_NAMESPACES \
PRODUCT_DEFAULT_WIFI_CHANNELS \
PRODUCT_DEFAULT_DEV_CERTIFICATE \
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
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_list, NamespacesToExport, $(PRODUCT_SOONG_NAMESPACES))
_contents := $(subst $(comma)$(newline)__SV_END,$(newline)}$(newline),$(_contents)__SV_END)
$(file >$(SOONG_VARIABLES).tmp,$(_contents))