diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-02-23 23:43:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 23:43:13 +0000 |
| commit | b54929b5a2f9fb327a0952cba38e583c36bc351d (patch) | |
| tree | 5442172d569c8f3fd7d2db235593d1ae0803f772 | |
| parent | b21761e73f077bafb1091e39097666eb45b129b6 (diff) | |
| parent | a7286837fc8fab3dba3d60309c5389c7ebc70571 (diff) | |
Merge "Set updateable:false explicitly in apex rules." am: a3ab19e8f3 am: 6a103de895 am: a7286837fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590172
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5650736c60819b36b4dff3419208ed309bbeb3b8
| -rw-r--r-- | core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp | 1 | ||||
| -rw-r--r-- | core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp | 1 | ||||
| -rw-r--r-- | tests/RollbackTest/Android.bp | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp b/core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp index 42421ce0e9f3..3536c4088dd8 100644 --- a/core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp +++ b/core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp @@ -50,4 +50,5 @@ apex { key: "com.android.overlaytest.overlaid.key", apps: ["OverlayRemountedTest_Target"], installable: false, + updatable: false, } diff --git a/core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp b/core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp index 0b52dcc4fb85..f04140409bea 100644 --- a/core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp +++ b/core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp @@ -50,4 +50,5 @@ apex { key: "com.android.overlaytest.overlay.key", apps: ["OverlayRemountedTest_Overlay"], installable: false, + updatable: false, } diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp index 95044dc5e7bb..6e1cef496f40 100644 --- a/tests/RollbackTest/Android.bp +++ b/tests/RollbackTest/Android.bp @@ -105,6 +105,7 @@ apex { key: "com.android.apex.apkrollback.test.key", apps: ["TestAppAv1"], installable: false, + updatable: false, } apex { @@ -115,6 +116,7 @@ apex { key: "com.android.apex.apkrollback.test.key", apps: ["TestAppAv2"], installable: false, + updatable: false, } apex { @@ -125,4 +127,5 @@ apex { key: "com.android.apex.apkrollback.test.key", apps: ["TestAppACrashingV2"], installable: false, + updatable: false, } |