diff options
| author | Steven Moreland <smoreland@google.com> | 2019-03-29 23:05:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-29 23:05:20 +0000 |
| commit | 43f29072a974a4e57a519a098b6e81a1027eb77c (patch) | |
| tree | 20cddee41cf0aede321b527a4a7088efe24454c6 | |
| parent | f8fe94e5465ce5836df5e565c8f49414084a35e6 (diff) | |
| parent | e6132be52976045ebfa41eab558ad499ecb41659 (diff) | |
| download | system_core-43f29072a974a4e57a519a098b6e81a1027eb77c.tar.gz system_core-43f29072a974a4e57a519a098b6e81a1027eb77c.tar.bz2 system_core-43f29072a974a4e57a519a098b6e81a1027eb77c.zip | |
Merge "libutils/libcutils: make host more like device"
| -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, + }, }, } |