commit 5df7366e124da1b3c4c8b410da02a460258966b2
author Bertrand Simonnet <bsimonnet@google.com> Tue Oct 13 20:08:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 20:08:37 2015 +0000
tree 9956480b8ba1a19db106a656bc53ab9655458a14
parent f0eab40487b2894fed06eb59eda1c8877b0d483b
parent f698ca63d970e1ed7f9b5c4090d2cf5cfa659e55

am f698ca63: Merge "Add the product version to target_files.zip."

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index bbae732..e34f8a0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1607,6 +1607,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.