aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-08-06 10:58:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-06 10:58:54 -0700
commite0b9cfc6f9b56db98594c203d7f2b273ad42e672 (patch)
treeb0872a63c797e3087d716e4916faee431aa74d3e
parent4f2051b1bbdb7a2202c706a6ddc3b82734e94ea0 (diff)
parenta130af98edd45c35142daeb59200e6bd6dbdb84a (diff)
downloadbuild-e0b9cfc6f9b56db98594c203d7f2b273ad42e672.tar.gz
Merge "Write the missing system build props to recovery build prop file."
am: a130af98ed Change-Id: Ie857cfd750b02d2d36556d495e091b31e55cea73
-rw-r--r--core/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index 7745cf3eb7..1da4d97413 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1466,6 +1466,7 @@ endef
$(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \
$(INSTALLED_DEFAULT_PROP_TARGET) \
$(INSTALLED_VENDOR_DEFAULT_PROP_TARGET) \
+ $(intermediate_system_build_prop) \
$(INSTALLED_VENDOR_BUILD_PROP_TARGET) \
$(INSTALLED_PRODUCT_BUILD_PROP_TARGET) \
$(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET)
@@ -1474,6 +1475,7 @@ $(INSTALLED_RECOVERY_BUILD_PROP_TARGET): \
$(hide) rm -f $@
$(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) > $@
$(hide) cat $(INSTALLED_VENDOR_DEFAULT_PROP_TARGET) >> $@
+ $(hide) cat $(intermediate_system_build_prop) >> $@
$(hide) cat $(INSTALLED_VENDOR_BUILD_PROP_TARGET) >> $@
$(hide) cat $(INSTALLED_PRODUCT_BUILD_PROP_TARGET) >> $@
$(hide) cat $(INSTALLED_PRODUCT_SERVICES_BUILD_PROP_TARGET) >> $@