commit 6c70b85cb3c75650e5154366fb5e08e3aadf9a50
author Baligh Uddin <baligh@google.com> Sat May 21 00:04:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 21 00:04:37 2016 +0000
tree e50bc3f5b9f658259bb0af91d79475b5cb0938cf
parent cea440c2ebb8982158adc8bebf3a4cd85a5950fd
parent 275af3429f3049378862883dc6a0db2701f9311f

Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am: 275af3429f

* commit '275af3429f3049378862883dc6a0db2701f9311f':
  Add Oem Props to otatools package

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 8345ddc..1879410 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1351,7 +1351,7 @@
 	$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
 	$(hide) (cd $(zip_root) && zip -qry $(abspath $@) *)
 	$(hide) zip -qry $(abspath $@) build/target/product/security/
-	$(hide) find device vendor -name \*.pk8 -o -name verifiedboot\* -o -name \*.x509.pem -o -name oem.prop | xargs zip -qry $(abspath $@)>/dev/null || true
+	$(hide) find device vendor -name \*.pk8 -o -name verifiedboot\* -o -name \*.x509.pem -o -name oem\*.prop | xargs zip -qry $(abspath $@)>/dev/null || true
 
 .PHONY: otatools-package
 otatools-package: $(BUILT_OTATOOLS_PACKAGE)