diff options
| author | Lepton Wu <lepton@chromium.org> | 2020-03-02 13:21:44 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-03 06:25:59 +0000 |
| commit | 65ce8aeaa052fdfbe5e76ec680c08451e1915e7f (patch) | |
| tree | 014579dea6d6b89f5c2192d7bb1ef19868da5da7 | |
| parent | 0227b80eb0d4d6331d7a8f0551b04ea26a3d7bf6 (diff) | |
| download | vboot-65ce8aeaa052fdfbe5e76ec680c08451e1915e7f.tar.gz | |
image_signing: Add one more cheets flavor.
On Pi, the target name is sdk_cheets instead of sdk_google_cheets
BUG=chromium:1057649
TEST=./sign_android_unittests.sh
BRANCH=none
Change-Id: Ic4e5123687eee7fc9f6c0640b7b9455f180dff6e
Signed-off-by: Lepton Wu <lepton@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2083836
Reviewed-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-by: George Engelbrecht <engeg@google.com>
| -rw-r--r-- | scripts/image_signing/lib/sign_android_lib.sh | 4 | ||||
| -rwxr-xr-x | scripts/image_signing/sign_android_unittests.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/image_signing/lib/sign_android_lib.sh b/scripts/image_signing/lib/sign_android_lib.sh index eae2a360..7de328a4 100644 --- a/scripts/image_signing/lib/sign_android_lib.sh +++ b/scripts/image_signing/lib/sign_android_lib.sh @@ -115,7 +115,8 @@ android_choose_signing_keyset() { # - cheets builds: # ro.build.flavor=cheets_${arch}-user(debug) # - SDK builds: - # ro.build.flavor=sdk_google_cheets_${arch}-user(debug) + # ro.build.flavor=sdk_google_cheets_${arch}-user(debug) # For N + # ro.build.flavor=sdk_cheets_${arch}-user(debug) # For P # - AOSP builds: # ro.build.flavor=aosp_cheets_${arch}-user(debug) # "cheets" and "SDK" builds both use the same signing keys, cheetskeys. "AOSP" @@ -123,6 +124,7 @@ android_choose_signing_keyset() { if [[ "${flavor_prop}" == aosp_cheets_* ]]; then keyset="aosp" elif [[ "${flavor_prop}" == cheets_* || + "${flavor_prop}" == sdk_cheets_* || "${flavor_prop}" == sdk_google_cheets_* ]]; then keyset="cheets" else diff --git a/scripts/image_signing/sign_android_unittests.sh b/scripts/image_signing/sign_android_unittests.sh index 00a651ff..9b0c034f 100755 --- a/scripts/image_signing/sign_android_unittests.sh +++ b/scripts/image_signing/sign_android_unittests.sh @@ -165,6 +165,8 @@ test_android_choose_signing_keyset() { choose_signing_keyset_test_helper "aosp_cheets_x86-userdebug" "aosp" echo "TEST: Keyset for sdk_google_cheets build." choose_signing_keyset_test_helper "sdk_google_cheets_x86-userdebug" "cheets" + echo "TEST: Keyset for sdk_cheets build." + choose_signing_keyset_test_helper "sdk_cheets_x86-userdebug" "cheets" echo "TEST: Keyset for cheets_x86 build." choose_signing_keyset_test_helper "cheets_x86-user" "cheets" echo "TEST: Keyset for cheets_arm build." |