commit b0a85dc46dff7bb5c277f2e85edfe38cf5b7ae36
author Jeffrey Huang <jeffreyhuang@google.com> Wed Feb 12 14:22:01 2020 -0800
committer Jeffrey Huang <jeffreyhuang@google.com> Wed Feb 12 18:30:26 2020 -0800
tree afb873715f9e8238dbbf648c535bb01e3aae6393
parent 6d3fa224afd38f1ee440dbf54f3258351aa1c34c

Add apex_available to libs

Bug: 145922701
Test: m -j
Change-Id: If5cbe5651e47878520bdc5b943b17a4f72a2a2f3

libstats/pull/Android.bp

diff --git a/libstats/pull/Android.bp b/libstats/pull/Android.bp
index 827e992..d74a36b 100644
--- a/libstats/pull/Android.bp
+++ b/libstats/pull/Android.bp
@@ -29,12 +29,14 @@
     export_include_dirs: ["include"],
     shared_libs: [
         "libbinder_ndk",
-        "libstatssocket",
+        "liblog",
         "statsd-aidl-ndk_platform",
     ],
     static_libs: [
-        "liblog",
         "libutils",
+        // TODO(b/149340100): Clean this up when libstatssocket is moved to the apex.
+        "libstatssocket",
+        "libcutils",
     ],
     // enumerate stable entry points for APEX use
     stubs: {
@@ -43,4 +45,8 @@
             "30",
         ],
     },
+    apex_available: [
+        "com.android.os.statsd",
+        "test_com.android.os.statsd",
+    ],
 }

libstats/socket/Android.bp

diff --git a/libstats/socket/Android.bp b/libstats/socket/Android.bp
index f36b214..c478521 100644
--- a/libstats/socket/Android.bp
+++ b/libstats/socket/Android.bp
@@ -47,7 +47,13 @@
         versions: [
             "30",
         ],
-    }
+    },
+    apex_available: [
+        "com.android.os.statsd",
+        "test_com.android.os.statsd",
+        //TODO(b/149340100): Remove this once libstatssocket is only linked as shared.
+        "//apex_available:platform",
+    ],
 }
 
 cc_library_headers {