am 0216641e: am 6fe4ab94: am 58912c87: Merge "Don\'t fail build of otatools if there...

* commit '0216641e04e3eae6f3b7d50108e632b249c15f1c':
  Don't fail build of otatools if there are no device certificates

diff --git a/core/Makefile b/core/Makefile
index 89ab187..3485c86 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1310,7 +1310,7 @@ $(BUILT_OTATOOLS_PACKAGE): \
        $(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
        $(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools $(otatools_lib_path))
        $(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 $@)
+       $(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)