From d3f06c5f845ed340faf10396695a1fec4bc1c295 Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Fri, 14 Feb 2020 11:13:10 -0800
Subject: [PATCH 1/2] Revert "Move libstatssocket to apex"

This reverts commit 3f17225f75823aa22906130e8264e8876470e60a.

Reason for revert: major functional regression
Bug: 149538115
Change-Id: Ic5650a09afcfb735668a6ef35cfefc6c4c915a20
---
 apex/statsd/Android.bp | 3 +--
 cmds/statsd/Android.bp | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index baa1c251324fa..c0f84a0ba0702 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -20,7 +20,6 @@ apex {
 
 apex_defaults {
     native_shared_libs: [
-        "libstatssocket",
         "libstatspull",
         "libstats_jni",
     ],
@@ -77,4 +76,4 @@ cc_library_shared {
         //TODO (b/148620413): remove platform.
          "//apex_available:platform",
     ],
-}
+}
\ No newline at end of file
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 1bcf44e03c092..956fd29205cbe 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -120,14 +120,13 @@ cc_defaults {
         "libstatslog",
         "libstatsmetadata",
         "libsysutils",
-	// TODO(b/145923087): move to shared when statsd is moved to the apex
-        "libstatssocket",
         "libutils",
     ],
     shared_libs: [
         "libbinder",
         "libincident",
         "liblog",
+        "libstatssocket",
         "statsd-aidl-cpp",
     ],
 }

From dba4dfa1277c66ec23c2ce5ab895a2b744dc2478 Mon Sep 17 00:00:00 2001
From: Wonsik Kim <wonsik@google.com>
Date: Fri, 14 Feb 2020 11:13:22 -0800
Subject: [PATCH 2/2] 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      | 2 --
 apex/statsd/aidl/Android.bp | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

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