Merge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am: 50cae53b10
* commit '50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
Add Oem Props to otatools package
Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974
diff --git a/core/Makefile b/core/Makefile
index 22dcee1..becd51d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1346,7 +1346,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 \*.x509.pem -o -name oem.prop | xargs zip -qry $(abspath $@)>/dev/null || true
+ $(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem -o -name oem\*.prop | xargs zip -qry $(abspath $@)>/dev/null || true
.PHONY: otatools-package
otatools-package: $(BUILT_OTATOOLS_PACKAGE)