diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-27 16:14:55 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-27 20:07:37 -0700 |
| commit | e93d073f0aee090e30663a99dc290a6d932b143f (patch) | |
| tree | f68522c07fb9fb7ed5a8f03bd475141efea9a7eb /Android.bp | |
| parent | da30efac8863fdda3cefb9eff987fe5f710a8ec8 (diff) | |
| download | platform_external_protobuf-e93d073f0aee090e30663a99dc290a6d932b143f.tar.gz platform_external_protobuf-e93d073f0aee090e30663a99dc290a6d932b143f.tar.bz2 platform_external_protobuf-e93d073f0aee090e30663a99dc290a6d932b143f.zip | |
Rename libz-host -> libz
Also remove host_ldlibs -lpthread, which is a default now.
Test: m host
Change-Id: Ifee46f2f2aaf158329fca207fcc9198e27926a68
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp index 75454592d..f88938eef 100644 --- a/Android.bp +++ b/Android.bp @@ -214,12 +214,10 @@ cc_library_shared { srcs: protobuf_cc_full_src_files, cflags: ["-DGOOGLE_PROTOBUF_NO_RTTI"], + shared_libs: ["libz"], target: { android: { - shared_libs: ["libz", "liblog"], - }, - host: { - shared_libs: ["libz-host"], + shared_libs: ["liblog"], }, }, } @@ -234,12 +232,10 @@ cc_library_shared { srcs: protobuf_cc_full_src_files, rtti: true, + shared_libs: ["libz"], target: { android: { - shared_libs: ["libz", "liblog"], - }, - host: { - shared_libs: ["libz-host"], + shared_libs: ["liblog"], }, }, } @@ -261,7 +257,7 @@ cc_library_host_shared { rtti: true, - shared_libs: ["libz-host"], + shared_libs: ["libz"], } // Android Protocol buffer compiler, aprotoc (host executable) @@ -275,9 +271,6 @@ cc_binary_host { windows: { enabled: true, }, - not_windows: { - host_ldlibs: ["-lpthread"], - }, }, // Statically link libc++ because we copy aprotoc to unbundled projects where |