diff options
| author | shagbag913 <sh4gbag913@gmail.com> | 2019-08-01 22:43:26 -0400 |
|---|---|---|
| committer | shagbag913 <sh4gbag913@gmail.com> | 2019-08-01 23:04:49 -0400 |
| commit | cc1d78713c926ff0fbc2dc3e697417279eb14f02 (patch) | |
| tree | 8739763e61de6d6f57cc58ef671a4978f6abc46c | |
| parent | ff27cc2e784e3b69535c1f8c4d09a2c952c0f9ee (diff) | |
| download | build_make-cc1d78713c926ff0fbc2dc3e697417279eb14f02.tar.gz build_make-cc1d78713c926ff0fbc2dc3e697417279eb14f02.tar.bz2 build_make-cc1d78713c926ff0fbc2dc3e697417279eb14f02.zip | |
fix "build: Only set the default verity key as a fallback"
PRODUCT_VERITY_SIGNING_KEY is already set elsewhere
(build/core/product.mk), although it's blank, which causes the ?=
check to fail, which kills the build since the variable won't ever be
set. Use `strip` to fix the check.
Signed-off-by: shagbag913 <sh4gbag913@gmail.com>
Change-Id: I005377754a1f035b79111174f05ae687ba83b188
| -rw-r--r-- | target/product/verity.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target/product/verity.mk b/target/product/verity.mk index 950ce50d04..3a5f4f0cb6 100644 --- a/target/product/verity.mk +++ b/target/product/verity.mk @@ -23,7 +23,9 @@ PRODUCT_SUPPORTS_VERITY_FEC := true # The dev key is used to sign boot and recovery images, and the verity # metadata table. Actual product deliverables will be re-signed by hand. # We expect this file to exist with the suffixes ".x509.pem" and ".pk8". -PRODUCT_VERITY_SIGNING_KEY ?= build/target/product/security/verity +ifeq ($(strip $(PRODUCT_VERITY_SIGNING_KEY)),) +PRODUCT_VERITY_SIGNING_KEY := build/target/product/security/verity +endif PRODUCT_PACKAGES += \ verity_key |