diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-05-02 22:32:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-02 22:32:10 +0000 |
| commit | 3cf51cb436a66b3312b5dffeea1c6cbd8f0e7102 (patch) | |
| tree | b630b0cae65bce2719513e5831171c9d1f679845 | |
| parent | ce5efeba52da2b9397c1903279b7ba2686e30162 (diff) | |
| parent | 375b54ea184a97e655af69de3a5183c664291c1f (diff) | |
| download | apex-3cf51cb436a66b3312b5dffeea1c6cbd8f0e7102.tar.gz | |
Merge "Specify rotation target for CTS shims" into tm-dev
| -rw-r--r-- | shim/build/Android.bp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shim/build/Android.bp b/shim/build/Android.bp index 6dc64a3f..99121d21 100644 --- a/shim/build/Android.bp +++ b/shim/build/Android.bp @@ -448,7 +448,7 @@ genrule { targets: ["com.android.apex.cts.shim.v2_signed_bob_rot"], dest: "com.android.apex.cts.shim.v2_signed_bob_rot.apex", }, - cmd: "$(location :apksigner) sign --v1-signing-enabled false --v2-signing-enabled false --key $(location :com.android.apex.rotation.key.bob.pk8) --cert $(location :com.android.apex.rotation.key.bob.x509.pem) --lineage $(location :com.android.apex.rotation.key.bob.rot) --out $(out) $(location :com.android.apex.cts.shim.v2)", + cmd: "$(location :apksigner) sign --v1-signing-enabled false --v2-signing-enabled false --key $(location :com.android.apex.rotation.key.bob.pk8) --cert $(location :com.android.apex.rotation.key.bob.x509.pem) --lineage $(location :com.android.apex.rotation.key.bob.rot) --rotation-min-sdk-version 28 --out $(out) $(location :com.android.apex.cts.shim.v2)", } // v2 cts shim package signed by bob + lineage + rollback capability @@ -466,7 +466,7 @@ genrule { targets: ["com.android.apex.cts.shim.v2_signed_bob_rot_rollback"], dest: "com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex", }, - cmd: "$(location :apksigner) sign --v1-signing-enabled false --v2-signing-enabled false --key $(location :com.android.apex.rotation.key.bob.pk8) --cert $(location :com.android.apex.rotation.key.bob.x509.pem) --lineage $(location :com.android.apex.rotation.key.bob.rot.rollback) --out $(out) $(location :com.android.apex.cts.shim.v2)", + cmd: "$(location :apksigner) sign --v1-signing-enabled false --v2-signing-enabled false --key $(location :com.android.apex.rotation.key.bob.pk8) --cert $(location :com.android.apex.rotation.key.bob.x509.pem) --lineage $(location :com.android.apex.rotation.key.bob.rot.rollback) --rotation-min-sdk-version 28 --out $(out) $(location :com.android.apex.cts.shim.v2)", } // v3 cts shim package signed by bob @@ -501,7 +501,7 @@ genrule { targets: ["com.android.apex.cts.shim.v3_signed_bob_rot"], dest: "com.android.apex.cts.shim.v3_signed_bob_rot.apex", }, - cmd: "$(location :apksigner) sign --v1-signing-enabled false --v2-signing-enabled false --key $(location :com.android.apex.rotation.key.bob.pk8) --cert $(location :com.android.apex.rotation.key.bob.x509.pem) --lineage $(location :com.android.apex.rotation.key.bob.rot) --out $(out) $(location :com.android.apex.cts.shim.v3)", + cmd: "$(location :apksigner) sign --v1-signing-enabled false --v2-signing-enabled false --key $(location :com.android.apex.rotation.key.bob.pk8) --cert $(location :com.android.apex.rotation.key.bob.x509.pem) --lineage $(location :com.android.apex.rotation.key.bob.rot) --rotation-min-sdk-version 28 --out $(out) $(location :com.android.apex.cts.shim.v3)", } // This one is only used in ApexdHostTest and not meant to be installed |