commit db42edb83e04952ac95a48c1be4dadab98bc6a95
author Howard Ro <yro@google.com> Thu Feb 20 08:00:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 20 08:00:53 2020 +0000
tree 0b13f3d7c95e4d144c53effbb26bb23643e18d4a
parent 8056f61de3594b6ab5fbec8b1a8e1a29e1c9bcd8
parent bb6cd0b1286d13c58e38e1cc0cc8604b2109b444

Merge "Revert^2 "Migrate Statsd to the apex""

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 3b19692..2f3e2ac 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -21,6 +21,8 @@
 apex_defaults {
     native_shared_libs: [
         "libstats_jni",
+        "libstatspull",
+        "libstatssocket",
     ],
     binaries: ["statsd"],
     java_libs: [

apex/aidl/Android.bp

diff --git a/apex/aidl/Android.bp b/apex/aidl/Android.bp
index f7a8176..487c8e1 100644
--- a/apex/aidl/Android.bp
+++ b/apex/aidl/Android.bp
@@ -38,6 +38,13 @@
         },
         ndk: {
             enabled: true,
-        }
+            apex_available: [
+                // TODO(b/145923087): Remove this once statsd binary is in apex
+                "//apex_available:platform",
+
+                "com.android.os.statsd",
+                "test_com.android.os.statsd",
+            ],
+        },
     }
 }