commit 7c4a34642aecebb35845345cc86dfe63c86936f5
author Dan Albert <danalbert@google.com> Fri Mar 13 23:21:20 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 13 23:21:20 2015 +0000
tree 75e0bf8087293f67273774958b3fea663f204089
parent ebb611f8d3911434072611cb0e48302fc9ed1226
parent fcd0d98b6cedde450a6e4d62df2209d8295752fc

am fcd0d98b: Merge "include oem.prop files in otatools_package"

* commit 'fcd0d98b6cedde450a6e4d62df2209d8295752fc':
  include oem.prop files in otatools_package

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 16e511d..af498e0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1281,7 +1281,7 @@
 	$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
 	$(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools)
 	$(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)