Merge "Use libapexsupport only for apex variants" into main
diff --git a/Android.bp b/Android.bp
index ee61635..d9e0694 100644
--- a/Android.bp
+++ b/Android.bp
@@ -126,6 +126,11 @@
                 "libvndksupport",
             ],
         },
+        non_apex: {
+            exclude_shared_libs: [
+                "libapexsupport",
+            ],
+        },
     },
     min_sdk_version: "29",
 }