Merge "Add libstatspull and libstatssocket to the apex"

2020-02-20 02:35:47 +00:00
parent 710895ed78 7b31ff81c5
commit d71f157eb6
2 changed files with 7 additions and 1 deletions
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -21,6 +21,8 @@ apex {
 apex_defaults {
    native_shared_libs: [
        "libstats_jni",
+        "libstatspull",
+        "libstatssocket",
    ],
    binaries: ["statsd"],
    java_libs: [
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -302,6 +302,11 @@ cc_test {
    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 @@ cc_test {

    shared_libs: [
        "libprotobuf-cpp-lite",
-        "libstatssocket"
    ],

 }