commit dc3f1214d9b02644956bddd099c27e12e6123938
author Bertrand Simonnet <bsimonnet@google.com> Tue Oct 13 20:22:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 20:22:10 2015 +0000
tree a0223dc9c822d09fd73ee3c1169c702ffbdabc27
parent 08c9f7db4168b18bdfce03766dffa433d5ca5f47
parent 123b060f042349f64e336b5202dc1e2d92e262fd

am 123b060f: am 5df7366e: am f698ca63: Merge "Add the product version to target_files.zip."

* commit '123b060f042349f64e336b5202dc1e2d92e262fd':
  Add the product version to target_files.zip.

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index e9179e4..d01701e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1606,6 +1606,9 @@
 	$(hide) for part in $(UPDATE_AB_PARTITIONS); do \
 	  echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \
 	done
+ifdef OSRELEASED_DIRECTORY
+	$(hide) $(ACP) $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/product_version $(zip_root)/META/product_version.txt
+endif
 endif
 ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)
 	@# If breakpad symbols have been generated, add them to the zip.