commit aef79352008f980047ea897854236e1ef0829a5a
author Alice Wang <aliceywang@google.com> Tue Oct 31 15:01:15 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 31 15:01:22 2023 +0000
tree 1b33be060cceb8540cee69b9ed3bb0be21fb321d
parent fcbf5ff4c5781b9911e538766a494149abcef327

Revert "[rkp] Expose RKP Hal implementation in virtualizationservice"

Revert submission 2778549-expose-avf-rkp-hal

Reason for revert: SELinux denial
avc:  denied  { find } for pid=3400 uid=10085 name=android.hardware.security.keymint.IRemotelyProvisionedComponent/avf scontext=u:r:rkpdapp:s0:c85,c256,c512,c768 tcontext=u:object_r:avf_remotelyprovisionedcomponent_service:s0 tclass=service_manager permissive=0


Reverted changes: /q/submissionid:2778549-expose-avf-rkp-hal

Bug: 308596709
Change-Id: I9c088bb5843433dbf29282f9f48b2d8693b0fedd

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 7983181..a05f7b0 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -60,20 +60,7 @@
     ],
 }
 
-soong_config_module_type {
-    name: "flag_aware_apex_defaults",
-    module_type: "apex_defaults",
-    config_namespace: "ANDROID",
-    bool_variables: [
-        "release_avf_enable_remote_attestation",
-    ],
-    properties: [
-        "prebuilts",
-        "vintf_fragments",
-    ],
-}
-
-flag_aware_apex_defaults {
+apex_defaults {
     name: "com.android.virt_avf_enabled",
 
     defaults: ["com.android.virt_common"],
@@ -105,19 +92,8 @@
         "fd_server",
         "vm",
     ],
-    soong_config_variables: {
-        release_avf_enable_remote_attestation: {
-            prebuilts: ["com.android.virt.init_attestation_enabled.rc"],
-            vintf_fragments: [
-                "virtualizationservice.xml",
-            ],
-            conditions_default: {
-                prebuilts: ["com.android.virt.init.rc"],
-            },
-        },
-    },
     prebuilts: [
-        "com.android.virt.vfio_handler.rc",
+        "com.android.virt.init.rc",
         "features_com.android.virt.xml",
         "microdroid_initrd_debuggable",
         "microdroid_initrd_normal",
@@ -152,23 +128,9 @@
 }
 
 prebuilt_etc {
-    name: "com.android.virt.vfio_handler.rc",
-    src: "vfio_handler.rc",
-    filename: "vfio_handler.rc",
-    installable: false,
-}
-
-prebuilt_etc {
     name: "com.android.virt.init.rc",
     src: "virtualizationservice.rc",
-    filename: "virtualizationservice.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "com.android.virt.init_attestation_enabled.rc",
-    src: "virtualizationservice_attestation_enabled.rc",
-    filename: "virtualizationservice.rc",
+    filename: "init.rc",
     installable: false,
 }