summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/Android.bp10
-rw-r--r--runtime/jit/profiling_info_test.cc1
2 files changed, 2 insertions, 9 deletions
diff --git a/runtime/Android.bp b/runtime/Android.bp
index b347019be2..0345c2f4f7 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -338,14 +338,10 @@ libart_cc_defaults {
"thread_android.cc",
],
shared_libs: [
- // For android::FileMap used by libziparchive.
- "libutils",
"libtombstoned_client",
],
static_libs: [
- // ZipArchive support, the order matters here to get all symbols.
- "libziparchive",
- "libz",
+ "libz", // For adler32.
],
},
android_arm: {
@@ -367,8 +363,7 @@ libart_cc_defaults {
"thread_linux.cc",
],
shared_libs: [
- "libziparchive",
- "libz",
+ "libz", // For adler32.
],
},
},
@@ -600,7 +595,6 @@ art_cc_test {
],
shared_libs: [
"libbacktrace",
- "libziparchive",
],
header_libs: [
"art_cmdlineparser_headers", // For parsed_options_test.
diff --git a/runtime/jit/profiling_info_test.cc b/runtime/jit/profiling_info_test.cc
index 106a80a568..8424610cf8 100644
--- a/runtime/jit/profiling_info_test.cc
+++ b/runtime/jit/profiling_info_test.cc
@@ -31,7 +31,6 @@
#include "mirror/class_loader.h"
#include "profile/profile_compilation_info.h"
#include "scoped_thread_state_change-inl.h"
-#include "ziparchive/zip_writer.h"
namespace art {