commit b20e34d5fba71f4a5ffac6504fe04dd8cc1b2a8f
author Nikita Ioffe <ioffe@google.com> Wed Oct 19 01:34:06 2022 +0100
committer Nikita Ioffe <ioffe@google.com> Tue Nov 15 08:51:09 2022 +0000
tree e2add781a3e2841a0f7b285b058f941a75f1f5bc
parent 0729d9ea61ad43774e4f3e5f35c04930ce85c6d1

Remove uses-library

android.system.virtualmachine jar is now part of BCP

Bug: 243512044
Test: atest --test-mapping packages/modules/Virtualization:avf-presubmit
Change-Id: Ib70e3c4bd566e67c3a6cf9bfaae2b80ced9c5129

demo/AndroidManifest.xml

diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml
index 8fde69e..17a7680 100644
--- a/demo/AndroidManifest.xml
+++ b/demo/AndroidManifest.xml
@@ -9,7 +9,6 @@
         android:label="MicrodroidDemo"
         android:theme="@style/Theme.MicrodroidDemo"
         android:testOnly="true">
-        <uses-library android:name="android.system.virtualmachine" android:required="true" />
         <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

tests/benchmark/AndroidManifest.xml

diff --git a/tests/benchmark/AndroidManifest.xml b/tests/benchmark/AndroidManifest.xml
index c39b91c..8a7366a 100644
--- a/tests/benchmark/AndroidManifest.xml
+++ b/tests/benchmark/AndroidManifest.xml
@@ -18,7 +18,6 @@
     <uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" />
     <uses-permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE" />
     <application>
-        <uses-library android:name="android.system.virtualmachine" android:required="false" />
     </application>
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.microdroid.benchmark"

tests/testapk/AndroidManifest.xml

diff --git a/tests/testapk/AndroidManifest.xml b/tests/testapk/AndroidManifest.xml
index d5d7659..fefd20a 100644
--- a/tests/testapk/AndroidManifest.xml
+++ b/tests/testapk/AndroidManifest.xml
@@ -20,7 +20,6 @@
     <uses-sdk android:minSdkVersion="33" android:targetSdkVersion="33" />
     <uses-feature android:name="android.software.virtualization_framework" android:required="false" />
     <application>
-        <uses-library android:name="android.system.virtualmachine" android:required="false" />
     </application>
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.microdroid.test"