Revert "Change apex_available value of libavf based on avf_enabled"
Revert submission 3477737-move_apex_shortcut
Reason for revert: Likely culprit for b/394990888 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:3477737-move_apex_shortcut
Change-Id: I11a70fe1bd4d079eb5b62e4c0a3c0098e5f84648
diff --git a/libs/libavf/Android.bp b/libs/libavf/Android.bp
index aceb927..c958796 100644
--- a/libs/libavf/Android.bp
+++ b/libs/libavf/Android.bp
@@ -40,30 +40,8 @@
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,
@@ -75,6 +53,7 @@
"liblog",
],
export_include_dirs: ["include"],
+ apex_available: ["com.android.virt"],
version_script: "libavf.map.txt",
stubs: {
symbol_file: "libavf.map.txt",