diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-30 12:33:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-30 12:33:27 +0000 |
| commit | eead626e0567d11ed0402e9586a99ca4a1d023eb (patch) | |
| tree | 57cf06ed51f580f44da42def5c47f1c47e22f4a0 /libartbase | |
| parent | b97c8af44dca6f0edbe80b13921bd47f9913c6fb (diff) | |
| parent | 65ed42a3d3a7bf1a42e759ed53c16b179f54813a (diff) | |
| download | art-eead626e0567d11ed0402e9586a99ca4a1d023eb.tar.gz art-eead626e0567d11ed0402e9586a99ca4a1d023eb.tar.bz2 art-eead626e0567d11ed0402e9586a99ca4a1d023eb.zip | |
Merge "Revert "Link compression libs statically into libartbase and use those everywhere.""
Diffstat (limited to 'libartbase')
| -rw-r--r-- | libartbase/Android.bp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/libartbase/Android.bp b/libartbase/Android.bp index 44b75e6ae6..0c6b1a2ef6 100644 --- a/libartbase/Android.bp +++ b/libartbase/Android.bp @@ -49,15 +49,20 @@ cc_defaults { ], target: { android: { + static_libs: [ + // ZipArchive support, the order matters here to get all symbols. + "libziparchive", + "libz", + ], shared_libs: [ // For android::FileMap used by libziparchive. "libutils", ], }, host: { - static_libs: [ - // For android::FileMap used by libziparchive. - "libutils", + shared_libs: [ + "libziparchive", + "libz", ], }, }, @@ -70,18 +75,6 @@ cc_defaults { // For common macros. "libbase", ], - - // Utilities used by various ART libs and tools are linked in statically - // here to avoid shared lib dependencies outside the ART APEX. No target - // there should depend on these separately. - whole_static_libs: [ - "liblz4", - "liblzma", - // ZipArchive support, the order matters here to get all symbols. - "libziparchive", - "libz", - ], - export_include_dirs: ["."], // ART's macros.h depends on libbase's macros.h. // Note: runtime_options.h depends on cmdline. But we don't really want to export this @@ -96,6 +89,8 @@ cc_defaults { "libcutils", "liblog", "libutils", + "libz", + "libziparchive", ], } @@ -134,6 +129,7 @@ art_cc_library { }, shared_libs: [ "libbase", + "libziparchive", ], export_shared_lib_headers: ["libbase"], } @@ -144,6 +140,11 @@ art_cc_library { "art_debug_defaults", "libartbase_defaults", ], + shared_libs: [ + "libbase", + "libziparchive", + ], + export_shared_lib_headers: ["libbase"], } art_cc_library { |