commit b2cdb1cca54de5e70dfca89e760cc33960d0bf24
author Doug Zongker <dougz@google.com> Mon Aug 25 08:08:26 2014 -0700
committer Dan Albert <danalbert@google.com> Fri Mar 13 11:36:15 2015 -0700
tree 0f3f5407a9f12e9d7622d9d9945e5118760865d9
parent f749b4b66494dae442ab1174c3b1db35ed1df1a8

include oem.prop files in otatools_package

Change-Id: I2f28936edda5d8d9bff6213828c16d607263cd95
(cherry picked from commit ce43bc8df2fae960eb02e56a55d365e7c18a1fc1)

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index a192e43..fae3a7b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1284,7 +1284,7 @@
 	$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
 	$(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools $(otatools_lib_path))
 	$(hide) zip -qry $(abspath $@) build/target/product/security/
-	$(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@)
+	$(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem -o -name oem.prop | xargs zip -qry $(abspath $@)
 
 .PHONY: otatools-package
 otatools-package: $(BUILT_OTATOOLS_PACKAGE)