commit 3d0660147f02370fe4b2c7d7337fcf5ca7a4839d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 08 21:08:51 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 08 21:08:51 2018 +0000
tree 329190011aea227042a5bb94f50443cd42797070
parent dc241ce903bc3afb137b9b5626e06a5eafab69dd
parent 281fee0dd44a4349fec38fd6f6348ca381c80218

Merge "ART: Remove static libbase"

dexdump/Android.bp

diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index eca0844..c63d6c3 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -46,7 +46,6 @@
     device_supported: false,
     static_libs: [
         "libdexfile",
-        "libbase",
     ] + art_static_dependencies,
     target: {
         darwin: {

dexlayout/Android.bp

diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 24be25b..facda11 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -113,6 +113,7 @@
     shared_libs: [
         "libart",
         "libart-dexlayout",
+        "libbase",
     ],
     target: {
         android: {

libdexfile/Android.bp

diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index ae4ded5..988ee03 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -40,7 +40,6 @@
             static_libs: [
                 "libziparchive",
                 "libz",
-                "libbase",
             ],
             shared_libs: [
                 "libutils",

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index daab232..590a399 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -351,7 +351,6 @@
                 // ZipArchive support, the order matters here to get all symbols.
                 "libziparchive",
                 "libz",
-                "libbase",
             ],
         },
         android_arm: {