Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev am: 0418406186

am: 6187c1dabe

* commit '6187c1dabe142e9644706dfd5962e1db6376eb8f':
  Add Oem Props to otatools package

Change-Id: I56a7440bb7cb189b7bd25223165d083a12bdb195
This commit is contained in:
Baligh Uddin 2016-05-21 00:33:54 +00:00 committed by android-build-merger
commit 5349e26a0e
1 changed files with 1 additions and 1 deletions

View File

@ -1623,7 +1623,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP)
$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
$(hide) (cd $(zip_root) && zip -qryX $(abspath $@) *)
$(hide) zip -qryX $(abspath $@) build/target/product/security/
$(hide) find device vendor -name \*.pk8 -o -name verifiedboot\* -o -name \*.x509.pem -o -name oem.prop | xargs zip -qryX $(abspath $@)>/dev/null || true
$(hide) find device vendor -name \*.pk8 -o -name verifiedboot\* -o -name \*.x509.pem -o -name oem\*.prop | xargs zip -qryX $(abspath $@)>/dev/null || true
.PHONY: otatools-package
otatools-package: $(BUILT_OTATOOLS_PACKAGE)