Merge "Revert^2 "Make libstatspull host supported""

libstats/pull/Android.bp

@@ -31,18 +31,39 @@ cc_defaults {
     shared_libs: [
         "libbinder_ndk",
         "liblog",
-        "libstatssocket",
     ],
     static_libs: [
         "libutils",
         "statsd-aidl-ndk_platform",
     ],
+    target: {
+        android: {
+            shared_libs: ["libstatssocket"],
+        },
+        host: {
+            static_libs: ["libstatssocket"],
+        },
+    },
 }
-cc_library_shared {
+cc_library {
     name: "libstatspull",
     defaults: [
-        "libstatspull_defaults"
+        "libstatspull_defaults",
+        "libbinder_ndk_host_user",
     ],
+    host_supported: true,
+    target: {
+        android: {
+            static: {
+                enabled: false,
+            },
+        },
+        host: {
+            shared: {
+                enabled: false,
+            },
+        },
+    },
     // enumerate stable entry points for APEX use
     stubs: {
         symbol_file: "libstatspull.map.txt",