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] 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",
     ],
 }