Revert "[avf] Add rkpdapp variation for e2e VM attestation test"
This reverts commit 482d81d74387f27e2789768b68b03c69f985b02c.
Reason for revert: The rkpdapp variation is no longer needed with
on-demand avf key provisioning triggered during the vm attestation.
Change-Id: I8cb33e7739f3e5a3dcfd73c45e1a47beaa6d2fc9
diff --git a/app/Android.bp b/app/Android.bp
index 9cfffdb..2f7aef9 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -56,9 +56,13 @@
apexes: ["com.android.rkpd"],
}
-java_defaults {
- name: "rkpdapp_defaults",
+android_app {
+ name: "rkpdapp",
sdk_version: "module_current",
+ target_sdk_version: "34",
+ min_sdk_version: "33",
+ updatable: false,
+ privileged: true,
libs: [
"framework-annotations-lib",
"framework-connectivity",
@@ -83,15 +87,6 @@
plugins: [
"androidx.room_room-compiler-plugin",
],
-}
-
-android_app {
- name: "rkpdapp",
- defaults: ["rkpdapp_defaults"],
- target_sdk_version: "34",
- min_sdk_version: "33",
- updatable: false,
- privileged: true,
apex_available: [
"com.android.rkpd",
],
@@ -99,10 +94,3 @@
strict_updatability_linting: true,
},
}
-
-android_test_helper_app {
- name: "avf-rkpdapp",
- defaults: ["rkpdapp_defaults"],
- additional_manifests: ["AndroidManifest.avf.xml"],
- visibility: ["//packages/modules/Virtualization:__subpackages__"],
-}
diff --git a/app/AndroidManifest.avf.xml b/app/AndroidManifest.avf.xml
deleted file mode 100644
index 664cd99..0000000
--- a/app/AndroidManifest.avf.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Copyright (C) 2024 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.rkpdapp">
-
- <!-- The VM permissions are required for running pVM remote attestation from a VM. -->
- <uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" />
- <uses-permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE" />
-
-</manifest>
