commit ad71c5d09e4f6ff438a72d6c4e8b372af4de79c1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Sep 22 21:22:34 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Sep 22 21:22:34 2024 +0000
tree 8d81189d27bef1c98b0ba40e3d3ba0ce5cbf5187
parent 83ff45cd92263ac8da14176efe2fa521a312ccea
parent 5fba53f9f1a6548dc7e038ca7fd572fdd29b83b0

Snap for 12399922 from 5fba53f9f1a6548dc7e038ca7fd572fdd29b83b0 to 24Q4-release

Change-Id: I5baef56d6c21260da83b9cef442420e89396cd92

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index be62d18..4916df7 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -136,7 +136,6 @@
         "vm",
     ],
     prebuilts: [
-        "features_com.android.virt.xml",
         "microdroid_initrd_debuggable",
         "microdroid_initrd_normal",
         "microdroid.json",

build/apex/permissions/Android.bp

diff --git a/build/apex/permissions/Android.bp b/build/apex/permissions/Android.bp
index 0c925ce..678a4f2 100644
--- a/build/apex/permissions/Android.bp
+++ b/build/apex/permissions/Android.bp
@@ -21,4 +21,5 @@
     name: "features_com.android.virt.xml",
     sub_dir: "permissions",
     src: "features_com.android.virt.xml",
+    soc_specific: true,
 }

build/apex/product_packages.mk

diff --git a/build/apex/product_packages.mk b/build/apex/product_packages.mk
index a024192..b2a4ca2 100644
--- a/build/apex/product_packages.mk
+++ b/build/apex/product_packages.mk
@@ -24,6 +24,7 @@
 
 PRODUCT_PACKAGES += \
     com.android.compos \
+    features_com.android.virt.xml
 
 # TODO(b/207336449): Figure out how to get these off /system
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST := \