commit eb4f311a193720e31484ac5d2cbc1a4d18e37d31
author Howard Ro <yro@google.com> Mon Feb 17 09:00:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 17 09:00:54 2020 +0000
tree 159111a4508c536082a3f970493e7c3e9522dece
parent c772ea0d67271cd87a91b94ed6ecc94eac218b94
parent 527d59013f3465aa976824e1c5714e23da12a560

Merge "Remove libstats_jni from the platform"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index c9d7470..c8aa526 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -20,8 +20,6 @@
 
 apex_defaults {
     native_shared_libs: [
-        "libstatssocket",
-        "libstatspull",
         "libstats_jni",
     ],
     // binaries: ["vold"],
@@ -30,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",
@@ -75,4 +72,4 @@
         "com.android.os.statsd",
         "test_com.android.os.statsd",
     ],
-}
+}
\ No newline at end of file

apex/aidl/Android.bp

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