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

Add support for TARGET_PRODUCT_PROP

Browse Source 
Like TARGET_SYSTEM_PROP, but is merged into /product/build.prop.

Also change the formatting of the output of both of these macros
slightly, so make the start and end clearer.

Bug: 119911662
Test: migrate downstream products to use this
Change-Id: Iddae7aac3c51b5706f3fb2690c5ca5a98840ad34
This commit is contained in:
Anton Hansson
2018-11-22 15:27:35 +00:00
parent 12fa690ff6
commit e9ee80e24a
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/Makefile
View File

@@ -415,11 +415,13 @@ endif
bash $(BUILDINFO_SH) >> $@ bash $(BUILDINFO_SH) >> $@
$(hide) $(foreach file,$(system_prop_file), \ $(hide) $(foreach file,$(system_prop_file), \
if [ -f "$(file)" ]; then \ if [ -f "$(file)" ]; then \
echo "#" >> $@; \
echo Target buildinfo from: "$(file)"; \ echo Target buildinfo from: "$(file)"; \
echo "" >> $@; \
echo "#" >> $@; \
echo "# from $(file)" >> $@; \ echo "# from $(file)" >> $@; \
echo "#" >> $@; \ echo "#" >> $@; \
cat $(file) >> $@; \ cat $(file) >> $@; \
echo "# end of $(file)" >> $@; \
fi;) fi;)
$(if $(FINAL_BUILD_PROPERTIES), \ $(if $(FINAL_BUILD_PROPERTIES), \
$(hide) echo >> $@; \ $(hide) echo >> $@; \
@@ -486,22 +488,38 @@ endif # property_overrides_split_enabled
INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/build.prop INSTALLED_PRODUCT_BUILD_PROP_TARGET := $(TARGET_OUT_PRODUCT)/build.prop
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_BUILD_PROP_TARGET) ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_BUILD_PROP_TARGET)
ifdef TARGET_PRODUCT_PROP
product_prop_files := $(TARGET_PRODUCT_PROP)
else
product_prop_files := $(wildcard $(TARGET_DEVICE_DIR)/product.prop)
endif
FINAL_PRODUCT_PROPERTIES += \ FINAL_PRODUCT_PROPERTIES += \
$(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES) $(ADDITIONAL_PRODUCT_PROPERTIES)) $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES) $(ADDITIONAL_PRODUCT_PROPERTIES))
FINAL_PRODUCT_PROPERTIES := $(call uniq-pairs-by-first-component, \ FINAL_PRODUCT_PROPERTIES := $(call uniq-pairs-by-first-component, \
$(FINAL_PRODUCT_PROPERTIES),=) $(FINAL_PRODUCT_PROPERTIES),=)
$(INSTALLED_PRODUCT_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(INSTALLED_PRODUCT_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(product_prop_files)
@echo Target product buildinfo: $@ @echo Target product buildinfo: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) echo > $@ $(hide) echo > $@
ifdef BOARD_USES_PRODUCTIMAGE ifdef BOARD_USES_PRODUCTIMAGE
$(hide) $(call generate-common-build-props,product,$@) $(hide) $(call generate-common-build-props,product,$@)
endif # BOARD_USES_PRODUCTIMAGE endif # BOARD_USES_PRODUCTIMAGE
$(hide) $(foreach file,$(product_prop_files), \
if [ -f "$(file)" ]; then \
echo Target product properties from: "$(file)"; \
echo "" >> $@; \
echo "#" >> $@; \
echo "# from $(file)" >> $@; \
echo "#" >> $@; \
cat $(file) >> $@; \
echo "# end of $(file)" >> $@; \
fi;)
$(hide) echo "#" >> $@; \ $(hide) echo "#" >> $@; \
echo "# ADDITIONAL PRODUCT PROPERTIES" >> $@; \ echo "# ADDITIONAL PRODUCT PROPERTIES" >> $@; \
echo "#" >> $@; \ echo "#" >> $@; \
echo "ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)" >> $@; echo "ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)" >> $@;
$(hide) $(foreach line,$(FINAL_PRODUCT_PROPERTIES), \ $(hide) $(foreach line,$(FINAL_PRODUCT_PROPERTIES), \
echo "$(line)" >> $@;) echo "$(line)" >> $@;)
$(hide) build/make/tools/post_process_props.py $@ $(hide) build/make/tools/post_process_props.py $@