Merge AndroidManifestNext.xml into AndroidManifest.xml
Changes in AndroidManifestNext.xml were released as part of Android V,
so it is safe to merge to manifest files into one.
This is a prerequisite to follow up patches.
Bug: 378681279
Bug: 365767108
Test: presubmit
Test: builds
Change-Id: Ic0d6b817233669384619f6c2227625a2f45fccd5
diff --git a/android/android.system.virtualmachine.res/Android.bp b/android/android.system.virtualmachine.res/Android.bp
index 1c55f78..c5d2dbb 100644
--- a/android/android.system.virtualmachine.res/Android.bp
+++ b/android/android.system.virtualmachine.res/Android.bp
@@ -2,23 +2,11 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-soong_config_module_type {
- name: "avf_flag_aware_android_app",
- module_type: "android_app",
- config_namespace: "ANDROID",
- bool_variables: ["release_avf_allow_preinstalled_apps"],
- properties: ["manifest"],
-}
-
// Defines our permissions
-avf_flag_aware_android_app {
+android_app {
name: "android.system.virtualmachine.res",
installable: true,
apex_available: ["com.android.virt"],
platform_apis: true,
- soong_config_variables: {
- release_avf_allow_preinstalled_apps: {
- manifest: "AndroidManifestNext.xml",
- },
- },
+ manifest: "AndroidManifest.xml",
}
diff --git a/android/android.system.virtualmachine.res/AndroidManifest.xml b/android/android.system.virtualmachine.res/AndroidManifest.xml
index 95b9cfa..ebcb8ba 100644
--- a/android/android.system.virtualmachine.res/AndroidManifest.xml
+++ b/android/android.system.virtualmachine.res/AndroidManifest.xml
@@ -20,11 +20,11 @@
<!-- @SystemApi Allows an application to create and run a Virtual Machine
using the Virtualization Framework APIs
(android.system.virtualmachine.*).
- <p>Protection level: signature|privileged|development
+ <p>Protection level: signature|preinstalled|development
@hide
-->
<permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE"
- android:protectionLevel="signature|privileged|development" />
+ android:protectionLevel="signature|preinstalled|development" />
<!-- @hide Allows an application to run a Virtual Machine with a custom
kernel or a Microdroid configuration file.
diff --git a/android/android.system.virtualmachine.res/AndroidManifestNext.xml b/android/android.system.virtualmachine.res/AndroidManifestNext.xml
deleted file mode 100644
index ebcb8ba..0000000
--- a/android/android.system.virtualmachine.res/AndroidManifestNext.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2021 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.virtualmachine.res">
-
- <!-- @SystemApi Allows an application to create and run a Virtual Machine
- using the Virtualization Framework APIs
- (android.system.virtualmachine.*).
- <p>Protection level: signature|preinstalled|development
- @hide
- -->
- <permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE"
- android:protectionLevel="signature|preinstalled|development" />
-
- <!-- @hide Allows an application to run a Virtual Machine with a custom
- kernel or a Microdroid configuration file.
- <p>Not for use by third-party applications.
- -->
- <permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE"
- android:protectionLevel="signature|development" />
-
- <!-- @hide Allows an application to access various Virtual Machine debug
- facilities, e.g. list all running VMs.
- <p>Not for use by third-party applications.
- -->
- <permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE"
- android:protectionLevel="signature" />
-
- <application android:hasCode="false" />
-</manifest>