commit b65a462e78c2e7167aa8072f57fa9341915918a3
author Colin Cross <ccross@android.com> Fri Feb 07 07:12:59 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 07 07:13:15 2025 -0800
tree ae62151f5cf0e8ba12a5cf5d6b14e36bae6f9e7a
parent bf5e5f45a57a2a4d834795ef877f13426b082557

Revert "Revert "Change apex_available value of libavf based on a..."

Revert submission 3481353-revert-3477737-move_apex_shortcut-EGRJFKGUNB

Reason for revert: relanding with fix

Reverted changes: /q/submissionid:3481353-revert-3477737-move_apex_shortcut-EGRJFKGUNB

Change-Id: Ib1d21c4db0ba652c59450ca2fa0743158e299d49

libs/libavf/Android.bp

diff --git a/libs/libavf/Android.bp b/libs/libavf/Android.bp
index c958796..aceb927 100644
--- a/libs/libavf/Android.bp
+++ b/libs/libavf/Android.bp
@@ -40,8 +40,30 @@
     defaults: ["libavf.default"],
 }
 
+soong_config_module_type {
+    name: "virt_cc_defaults",
+    module_type: "cc_defaults",
+    config_namespace: "ANDROID",
+    bool_variables: [
+        "avf_enabled",
+    ],
+    properties: [
+        "apex_available",
+    ],
+}
+
+virt_cc_defaults {
+    name: "libavf_apex_available_defaults",
+    soong_config_variables: {
+        avf_enabled: {
+            apex_available: ["com.android.virt"],
+        },
+    },
+}
+
 cc_library {
     name: "libavf",
+    defaults: ["libavf_apex_available_defaults"],
     llndk: {
         symbol_file: "libavf.map.txt",
         moved_to_apex: true,
@@ -53,7 +75,6 @@
         "liblog",
     ],
     export_include_dirs: ["include"],
-    apex_available: ["com.android.virt"],
     version_script: "libavf.map.txt",
     stubs: {
         symbol_file: "libavf.map.txt",