aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashed Abdel-Tawab <rashed@linux.com>2017-12-25 23:59:15 (GMT)
committerBruno Martins <bgcngm@gmail.com>2018-02-11 23:31:33 (GMT)
commit5b96acc56d3dd702d1343e6ea19ed4c893befae8 (patch)
tree8ae46874548cbee243ca609b8d55f0aa50b88757
parent19d9dc80b93e1744f3cc3256d861d31889f36801 (diff)
downloadandroid_build-staging/lineage-15.1.zip
android_build-staging/lineage-15.1.tar.gz
android_build-staging/lineage-15.1.tar.bz2
build: Add vendor.prop capabilitystaging/lineage-15.1refs/changes/49/199949/2
To get properties on /vendor/build.prop you have to add them via property overrides in makefiles. This adds a second option,a vendor.prop file in your device rootdir or TARGET_VENDOR_PROP, the exact same handling as system.prop. Change-Id: I8ab2b29bd0b5f0f2bcc0928d6a2a871c40582d3f
-rw-r--r--core/Makefile13
1 files changed, 13 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index e77f2e3..d91fa6b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -362,6 +362,11 @@ FINAL_VENDOR_BUILD_PROPERTIES := $(call uniq-pairs-by-first-component, \
$(FINAL_VENDOR_BUILD_PROPERTIES),=)
endif # property_overrides_split_enabled
+ifdef TARGET_VENDOR_PROP
+vendor_prop_file := $(TARGET_VENDOR_PROP)
+else
+vendor_prop_file := $(wildcard $(TARGET_DEVICE_DIR)/vendor.prop)
+endif
$(INSTALLED_VENDOR_BUILD_PROP_TARGET): $(VENDOR_BUILDINFO_SH) $(intermediate_system_build_prop)
@echo Target vendor buildinfo: $@
@mkdir -p $(dir $@)
@@ -379,6 +384,14 @@ ifdef property_overrides_split_enabled
TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \
TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \
bash $(VENDOR_BUILDINFO_SH) >> $@
+ $(hide) $(foreach file,$(vendor_prop_file), \
+ if [ -f "$(file)" ]; then \
+ echo "#" >> $@; \
+ echo Target buildinfo from: "$(file)"; \
+ echo "# from $(file)" >> $@; \
+ echo "#" >> $@; \
+ cat $(file) >> $@; \
+ fi;)
$(hide) echo "#" >> $@; \
echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \
echo "#" >> $@;