commit 00206905fed4b047eee9dc5850c571aae11c246a
author Steven Moreland <smoreland@google.com> Fri Mar 29 16:37:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 29 16:37:42 2019 -0700
tree d0798118c928ca2154e7f90792d6251c274ef529
parent fe2fb4419dc2eb2a1d9000d75256a25f65bc33bb
parent e398baa35b5873e32fef4398a3ac6d8b70ecd091

Merge "libutils/libcutils: make host more like device"
am: 43f29072a9

Change-Id: Ibe6cd59c77e6a65b7d6b0d864057d0c90c6d9063

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 83a7140..a27ecef 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -83,6 +83,8 @@
             ],
         },
         windows: {
+            host_ldlibs: ["-lws2_32"],
+
             srcs: [
                 "socket_inaddr_any_server_windows.cpp",
                 "socket_network_client_windows.cpp",
@@ -91,9 +93,6 @@
             ],
 
             enabled: true,
-            shared: {
-                enabled: false,
-            },
             cflags: [
                 "-D_GNU_SOURCE",
             ],

libutils/Android.bp

diff --git a/libutils/Android.bp b/libutils/Android.bp
index c67ff8f..3e7d0ba 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -69,6 +69,7 @@
     ],
 
     shared_libs: [
+        "libcutils",
         "liblog",
     ],
 
@@ -83,7 +84,6 @@
             cflags: ["-fvisibility=protected"],
 
             shared_libs: [
-                "libcutils",
                 "libprocessgroup",
                 "libdl",
                 "libvndksupport",
@@ -98,14 +98,6 @@
             exclude_shared_libs: ["libvndksupport"],
         },
 
-        host: {
-            cflags: ["-DLIBUTILS_NATIVE=1"],
-
-            shared: {
-                enabled: false,
-            },
-        },
-
         linux_bionic: {
             enabled: true,
         },
@@ -180,18 +172,20 @@
         },
     },
 
+    shared_libs: [
+         "libutils",
+         "libbacktrace",
+    ],
+
     target: {
-        android: {
-            shared_libs: [
-                "libutils",
-                "libbacktrace",
-            ],
-        },
         linux: {
             srcs: [
                 "ProcessCallStack.cpp",
             ],
         },
+        windows: {
+            enabled: false,
+        },
     },
 }