commit d9d7155069f30da80533c9508434ea3ba22d4a4d
author Alan Stokes <alanstokes@google.com> Mon Oct 09 13:37:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 09 13:37:31 2023 +0000
tree 46ad19433f0ec10a1becdb52595a4ed3dd9797fa
parent 88188c6d95cd61c99e38b22f1b8654b65f9bdead
parent c19db739b278e1f5ebbfc0e5d5398aa33bfeca86

Set API level 34 by number am: 64c575f4cc am: 9fedd1b816 am: c19db739b2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2775451

Change-Id: Id53c48326c29f840fe285829c1e4a05c48b5bd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

apex/empty-payload-apk/Android.bp

diff --git a/apex/empty-payload-apk/Android.bp b/apex/empty-payload-apk/Android.bp
index 70e6754..8bd138f 100644
--- a/apex/empty-payload-apk/Android.bp
+++ b/apex/empty-payload-apk/Android.bp
@@ -9,8 +9,8 @@
     apex_available: ["com.android.virt"],
     sdk_version: "system_current",
     jni_uses_platform_apis: true,
-    min_sdk_version: "UpsideDownCake",
-    target_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
+    target_sdk_version: "34",
     compile_multilib: "first",
     stl: "none",
 }

tests/no_avf/Android.bp

diff --git a/tests/no_avf/Android.bp b/tests/no_avf/Android.bp
index fd0d5e2..bece2ea 100644
--- a/tests/no_avf/Android.bp
+++ b/tests/no_avf/Android.bp
@@ -17,5 +17,5 @@
     ],
     sdk_version: "test_current",
     compile_multilib: "both",
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }

tests/vmshareapp/Android.bp

diff --git a/tests/vmshareapp/Android.bp b/tests/vmshareapp/Android.bp
index 6c2c9e4..5f6dc57 100644
--- a/tests/vmshareapp/Android.bp
+++ b/tests/vmshareapp/Android.bp
@@ -12,5 +12,5 @@
         // Defined in ../testapk/Android.bp
         "MicrodroidPayloadInOtherAppNativeLib",
     ],
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }