Remove dependencies on libutils.
The libutils dependency of libziparchive was removed in aosp/796795.
Test: art/test.py --host --64 --optimizing
Test: env ART_TEST_NO_SYNC=true make -j4 test-art-target-gtest
Test: art/test/testrunner/testrunner.py -j4 --target --64 --optimizing
Test: art/test/testrunner/run_build_test_target.py art-asan (build only)
Bug: 118374951
Change-Id: I58cdf7a39558c87e48bdc1274d6c6ddd36301d8d
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 0c6b1a2..5010f68 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -54,10 +54,6 @@
"libziparchive",
"libz",
],
- shared_libs: [
- // For android::FileMap used by libziparchive.
- "libutils",
- ],
},
host: {
shared_libs: [
@@ -88,7 +84,6 @@
"libbase",
"libcutils",
"liblog",
- "libutils",
"libz",
"libziparchive",
],
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 49b1278..7f25f02 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -43,9 +43,6 @@
"libziparchive",
"libz",
],
- shared_libs: [
- "libutils",
- ],
},
host: {
shared_libs: [
@@ -78,7 +75,6 @@
"libbase",
"libcutils",
"liblog",
- "libutils",
"libz",
"libziparchive",
],
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index edd9fa8..a8d8b2f 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -28,10 +28,6 @@
"libziparchive",
"libz",
],
- shared_libs: [
- // For android::FileMap used by libziparchive.
- "libutils",
- ],
},
host: {
shared_libs: [
@@ -61,7 +57,6 @@
static_libs: [
"libbase",
"libcutils",
- "libutils",
"libz",
"libziparchive",
],
diff --git a/tools/veridex/Android.bp b/tools/veridex/Android.bp
index 92ace03..c375138 100644
--- a/tools/veridex/Android.bp
+++ b/tools/veridex/Android.bp
@@ -30,7 +30,6 @@
"libartbase",
"libbase",
"liblog",
- "libutils",
"libz",
"libziparchive",
],