diff options
author | Steven Moreland <smoreland@google.com> | 2019-03-29 17:49:56 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-29 17:49:56 -0700 |
commit | 6e10e67eaaac7be1873f39f73d36d507c7bf68ce (patch) | |
tree | 047bbe21448d2ebfe2e2961fe1de4a909ce13b43 | |
parent | 10bb961bf400f0cfcaa0bb417548eaa8bcfabdeb (diff) | |
parent | 775ed88ddd6d28cc4cc526b1d342c33cc9106ac9 (diff) |
Merge "libutils/libcutils: make host more like device" am: 43f29072a9 am: 02bb6c1b24
am: 775ed88ddd
Change-Id: I6d9a2c90499622ad61046b3c222f8cb9d688bd16
-rw-r--r-- | libcutils/Android.bp | 5 | ||||
-rw-r--r-- | libutils/Android.bp | 24 |
2 files changed, 11 insertions, 18 deletions
diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 83a71400b..a27ecef9e 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -83,6 +83,8 @@ cc_library { ], }, windows: { + host_ldlibs: ["-lws2_32"], + srcs: [ "socket_inaddr_any_server_windows.cpp", "socket_network_client_windows.cpp", @@ -91,9 +93,6 @@ cc_library { ], enabled: true, - shared: { - enabled: false, - }, cflags: [ "-D_GNU_SOURCE", ], diff --git a/libutils/Android.bp b/libutils/Android.bp index c67ff8fab..3e7d0bac1 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -69,6 +69,7 @@ cc_defaults { ], shared_libs: [ + "libcutils", "liblog", ], @@ -83,7 +84,6 @@ cc_defaults { cflags: ["-fvisibility=protected"], shared_libs: [ - "libcutils", "libprocessgroup", "libdl", "libvndksupport", @@ -98,14 +98,6 @@ cc_defaults { exclude_shared_libs: ["libvndksupport"], }, - host: { - cflags: ["-DLIBUTILS_NATIVE=1"], - - shared: { - enabled: false, - }, - }, - linux_bionic: { enabled: true, }, @@ -180,18 +172,20 @@ cc_library { }, }, + shared_libs: [ + "libutils", + "libbacktrace", + ], + target: { - android: { - shared_libs: [ - "libutils", - "libbacktrace", - ], - }, linux: { srcs: [ "ProcessCallStack.cpp", ], }, + windows: { + enabled: false, + }, }, } |