OSDN Git Service

Don't fail build of otatools if there are no device certificates
authorClaes Elgemark <claes.elgemark@sonymobile.com>
Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)
committerBaligh Uddin <baligh@google.com>
Tue, 29 Sep 2015 21:56:03 +0000 (21:56 +0000)
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
(cherry picked from commit 8d771971212069f77851163f437c782f581bf6db)

core/Makefile

index 7c52f4e..c35ca6e 100644 (file)
@@ -1302,7 +1302,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)