Move MicrodroidVmShareApp to tests/vmshareapp directory
In the follow-up change I will introduce the Android service to
facilitate VM sharing between MicrodroidTestApp and
MicrodroidVmShareApp.
Moving the MicrodroidVmShareApp to its own directory will make the code
cleaner.
Bug: 259384440
Test: atest MicrodroidTestApp
Change-Id: Id5b2f5d14ea3e008a6065389a8f6e9734ddde26b
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 76b4184..26bcd03 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -37,22 +37,10 @@
"MicrodroidPrivateLinkingNativeLib",
],
min_sdk_version: "33",
+ // Defined in ../vmshareapp/Android.bp
data: [":MicrodroidVmShareApp"],
}
-// Helper app to verify that we can create a VM using others app payload.
-android_test_helper_app {
- name: "MicrodroidVmShareApp",
- defaults: ["MicrodroidTestAppsDefaults"],
- jni_libs: [
- "MicrodroidPayloadInOtherAppNativeLib",
- ],
- min_sdk_version: "UpsideDownCake",
- manifest: "AndroidManifest_VmShareApp.xml",
- // The MicrodroidVmShareApp doesn't need assets.
- asset_dirs: [],
-}
-
// Defaults shared between MicrodroidTestNativeLib and MicrodroidPayloadInOtherAppNativeLib shared
// libs. They are expected to share everything apart from the name, so that one app
// (MicrodroidTestApp) can start a payload defined in the another app (MicrodroidVmShareApp).
diff --git a/tests/testapk/AndroidManifest_VmShareApp.xml b/tests/testapk/AndroidManifest_VmShareApp.xml
deleted file mode 100644
index eed3364..0000000
--- a/tests/testapk/AndroidManifest_VmShareApp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.microdroid.vmshare_app">
- <uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" />
-
- <uses-feature android:name="android.software.virtualization_framework"
- android:required="false" />
-
- <application />
-</manifest>