Merge "Use libapexsupport only for apex variants" into main am: 74c341f86f am: f2bab15655 am: 0dc75c1d21

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2849656

Change-Id: I39251baffde5aa027ba43962280ff13c6bddabe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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",
 }