Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e14a61 authored by Dan Willemsen's avatar Dan Willemsen Committed by Android (Google) Code Review
Browse files

Merge "Add variables for configuring Soong plugins" into pi-dev

parents 6bb69c4c 79657520

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ endef 
# Set common values

# ###############################################################



# Initialize SOONG_CONFIG_NAMESPACES so that it isn't recursive.

SOONG_CONFIG_NAMESPACES :=



# Set the extensions used for various packages

COMMON_PACKAGE_SUFFIX := .zip

COMMON_JAVA_PACKAGE_SUFFIX := .jar

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ ifneq ($(filter $(dont_bother_goals), $(MAKECMDGOALS)),) 
dont_bother := true

endif



.KATI_READONLY := SOONG_CONFIG_NAMESPACES

.KATI_READONLY := $(foreach n,$(SOONG_CONFIG_NAMESPACES),SOONG_CONFIG_$(n))

.KATI_READONLY := $(foreach n,$(SOONG_CONFIG_NAMESPACES),$(foreach k,$(SOONG_CONFIG_$(n)),SOONG_CONFIG_$(n)_$(k)))



include $(SOONG_MAKEVARS_MK)



include $(BUILD_SYSTEM)/clang/config.mk

core/soong_config.mk

+9 −1
Original line number Diff line number Diff line
@@ -140,7 +140,15 @@ $(call add_json_list, NamespacesToExport, $(PRODUCT_SOONG_NAMESPA 


$(call add_json_list, PgoAdditionalProfileDirs,          $(PGO_ADDITIONAL_PROFILE_DIRS))



_contents := $(subst $(comma)$(newline)__SV_END,$(newline)}$(newline),$(_contents)__SV_END)

_contents := $(_contents)    "VendorVars": {$(newline)

$(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\

  $(eval _contents := $$(_contents)        "$(namespace)": {$$(newline)) \

  $(foreach key,$(SOONG_CONFIG_$(namespace)),\

    $(eval _contents := $$(_contents)            "$(key)": "$(SOONG_CONFIG_$(namespace)_$(key))",$$(newline)))\

  $(eval _contents := $$(_contents)$(if $(strip $(SOONG_CONFIG_$(namespace))),__SV_END)        },$$(newline)))

_contents := $(_contents)$(if $(strip $(SOONG_CONFIG_NAMESPACES)),__SV_END)    },$(newline)



_contents := $(subst $(comma)$(newline)__SV_END,$(newline),$(_contents)__SV_END}$(newline))



$(file >$(SOONG_VARIABLES).tmp,$(_contents))