commit f2a3fd5d98b8c52e2caba66f6d0b84c09b0225d5
author Steve Fung <stevefung@google.com> Thu Oct 15 18:35:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 15 18:35:57 2015 +0000
tree e0d00e9325d53f166a9de5d2404d4fd8fffc6a4f
parent c98da6590a179fb802ff548f82018454a0218d6d
parent 31ba99b9e279b588b584ed90cfc1ca9cc04855cd

am 31ba99b9: am a6968d8f: am 2af58637: Merge "Add the Product ID to target_files.zip"

* commit '31ba99b9e279b588b584ed90cfc1ca9cc04855cd':
  Add the Product ID to target_files.zip

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index d01701e..573ea9a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1607,6 +1607,7 @@
 	  echo "$${part}" >> $(zip_root)/META/ab_partitions.txt; \
 	done
 ifdef OSRELEASED_DIRECTORY
+	$(hide) $(ACP) $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/product_id $(zip_root)/META/product_id.txt
 	$(hide) $(ACP) $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/product_version $(zip_root)/META/product_version.txt
 endif
 endif