diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-30 12:33:04 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2018-10-30 12:33:04 +0000 |
| commit | 65ed42a3d3a7bf1a42e759ed53c16b179f54813a (patch) | |
| tree | 77930ed648604f50fe6a46059f4cc659b443ddb7 /libdexfile | |
| parent | 8a94003e66f337fe84870ff68d3f6f234555cf06 (diff) | |
| download | art-65ed42a3d3a7bf1a42e759ed53c16b179f54813a.tar.gz art-65ed42a3d3a7bf1a42e759ed53c16b179f54813a.tar.bz2 art-65ed42a3d3a7bf1a42e759ed53c16b179f54813a.zip | |
Revert "Link compression libs statically into libartbase and use those everywhere."
This reverts commit 8a94003e66f337fe84870ff68d3f6f234555cf06.
Reason for revert: Breaks asan and dex2oats.
Change-Id: Idea760bbd2b25078ecd1ee5a39da94f6b74432a7
bug: 118374951
Diffstat (limited to 'libdexfile')
| -rw-r--r-- | libdexfile/Android.bp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index d7399b3b77..49b1278fcb 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -39,10 +39,20 @@ cc_defaults { target: { android: { + static_libs: [ + "libziparchive", + "libz", + ], shared_libs: [ "libutils", ], }, + host: { + shared_libs: [ + "libziparchive", + "libz", + ], + }, }, generated_sources: ["dexfile_operator_srcs"], shared_libs: [ @@ -53,6 +63,7 @@ cc_defaults { "libcutils", // For common macros. "libbase", + "libz", ], export_include_dirs: ["."], export_shared_lib_headers: [ @@ -68,6 +79,8 @@ cc_defaults { "libcutils", "liblog", "libutils", + "libz", + "libziparchive", ], } @@ -145,6 +158,7 @@ art_cc_test { ], shared_libs: [ "libbacktrace", + "libziparchive", ], include_dirs: [ "external/zlib", |