commit d71f157eb65486107c8465cf0a141979265a4f6d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 20 02:35:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 20 02:35:47 2020 +0000
tree 4a3084dc239189693f6aeb4eb9dc4c68133cb057
parent 710895ed782641341bdbf6efc2d0b9bf22fd27f8
parent 7b31ff81c5c7e99e7ddce6b63500aeb850347d0d

Merge "Add libstatspull and libstatssocket to the apex"

apex/statsd/Android.bp

diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 3b196925..2f3e2ac 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -21,6 +21,8 @@
 apex_defaults {
     native_shared_libs: [
         "libstats_jni",
+        "libstatspull",
+        "libstatssocket",
     ],
     binaries: ["statsd"],
     java_libs: [

cmds/statsd/Android.bp

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 5fe64c4..73a8f66 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -302,6 +302,11 @@
     static_libs: [
         "libgmock",
         "libplatformprotos",
+
+        // TODO(b/149842105): Make libstatssocket shared and remove libcutils once statsd_test is
+        // moved to the apex.
+        "libstatssocket",
+        "libcutils",
     ],
 
     proto: {
@@ -311,7 +316,6 @@
 
     shared_libs: [
         "libprotobuf-cpp-lite",
-        "libstatssocket"
     ],
 
 }