From 3f17225f75823aa22906130e8264e8876470e60a Mon Sep 17 00:00:00 2001
From: Jeffrey Huang <jeffreyhuang@google.com>
Date: Wed, 12 Feb 2020 13:04:28 -0800
Subject: [PATCH] Move libstatssocket to apex

Bug: 145923416
Test: m
Test: fastboot flashall
Change-Id: Ieae64fb975bf7986f987e1f27548e041db2c505e
---
 apex/statsd/Android.bp | 3 ++-
 cmds/statsd/Android.bp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index c0f84a0ba0702..baa1c251324fa 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -20,6 +20,7 @@ apex {
 
 apex_defaults {
     native_shared_libs: [
+        "libstatssocket",
         "libstatspull",
         "libstats_jni",
     ],
@@ -76,4 +77,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 956fd29205cbe..1bcf44e03c092 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -120,13 +120,14 @@ 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",
     ],
 }