commit 36f0eeaf103f269ce3568eaa2ec793ef54bb1902
author Jeffrey Huang <jeffreyhuang@google.com> Wed Feb 12 11:30:11 2020 -0800
committer Jeffrey Huang <jeffreyhuang@google.com> Thu Feb 13 11:09:49 2020 -0800
tree 0dd9d3183330d77255520fe2d981cda0d14754c5
parent 915b1aeb962eb12ca54f836cfb380d72fae6936e

Move libstatspull to the apex

Bug: 145922701
Test: atest LibStatsPullTests
Change-Id: I159c5e6f092b35bf6576a576df95aaa266d71fa4

apex/statsd/Android.bp

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 1f9f18c..c0f84a0 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -20,6 +20,7 @@
 
 apex_defaults {
     native_shared_libs: [
+        "libstatspull",
         "libstats_jni",
     ],
     // binaries: ["vold"],
@@ -28,6 +29,7 @@
         "service-statsd",
     ],
     // prebuilts: ["my_prebuilt"],
+    compile_multilib: "both",
     name: "com.android.os.statsd-defaults",
     key: "com.android.os.statsd.key",
     certificate: ":com.android.os.statsd.certificate",

apex/statsd/aidl/Android.bp

diff --git a/apex/statsd/aidl/Android.bp b/apex/statsd/aidl/Android.bp
index 7c93bc7..4ccdd7e 100644
--- a/apex/statsd/aidl/Android.bp
+++ b/apex/statsd/aidl/Android.bp
@@ -38,6 +38,10 @@
         },
         ndk: {
             enabled: true,
+            apex_available: [
+                "com.android.os.statsd",
+            ],
         }
-    }
+
+    },
 }