aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaes Elgemark <claes.elgemark@sonymobile.com>2015-08-26 17:14:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 17:14:49 +0000
commit1a8c656704d949e14a4951d31a14b9a235eebe49 (patch)
treeb0e3216e7d6b47f7ca97f211525884169a1a4435
parent473b6a5f2b00f941acb08b5c3df59cbbdf647609 (diff)
parent8d771971212069f77851163f437c782f581bf6db (diff)
downloadbuild-1a8c656704d949e14a4951d31a14b9a235eebe49.tar.gz
am 8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '8d771971212069f77851163f437c782f581bf6db': Don't fail build of otatools if there are no device certificates
-rw-r--r--core/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index 670c581784..f9ba1d8c2e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1293,7 +1293,7 @@ $(BUILT_OTATOOLS_PACKAGE): \
$(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 | xargs zip -qry $(abspath $@)>/dev/null || true
.PHONY: otatools-package
otatools-package: $(BUILT_OTATOOLS_PACKAGE)