commit dba4dfa1277c66ec23c2ce5ab895a2b744dc2478
author Wonsik Kim <wonsik@google.com> Fri Feb 14 11:13:22 2020 -0800
committer Wonsik Kim <wonsik@google.com> Fri Feb 14 19:37:58 2020 +0000
tree 1de097d3331e3136cb8a23a804920bf609da0726
parent d3f06c5f845ed340faf10396695a1fec4bc1c295

Revert "Move libstatspull to the apex"

This reverts commit 36f0eeaf103f269ce3568eaa2ec793ef54bb1902.

Reason for revert: major functional regression
Bug: 149538115
Change-Id: I7cc3c1a62e9d2d0bac7fc77848eeacbf8dc7dbe2

apex/statsd/Android.bp

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index c0f84a0..1f9f18c 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -20,7 +20,6 @@
 
 apex_defaults {
     native_shared_libs: [
-        "libstatspull",
         "libstats_jni",
     ],
     // binaries: ["vold"],
@@ -29,7 +28,6 @@
         "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 4ccdd7e..7c93bc7 100644
--- a/apex/statsd/aidl/Android.bp
+++ b/apex/statsd/aidl/Android.bp
@@ -38,10 +38,6 @@
         },
         ndk: {
             enabled: true,
-            apex_available: [
-                "com.android.os.statsd",
-            ],
         }
-
-    },
+    }
 }