From 9c8ba9666d2fad27baae11e56d63485a22812d17 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Tue, 28 Apr 2015 09:23:26 +0100
Subject: [PATCH] Add a static dependency on libbase.

Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
---
 libs/androidfw/Android.mk     | 2 +-
 tools/aapt/Android.mk         | 3 ++-
 tools/split-select/Android.mk | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk
index 461160ad7336f..2f287000f7468 100644
--- a/libs/androidfw/Android.mk
+++ b/libs/androidfw/Android.mk
@@ -64,7 +64,7 @@ LOCAL_SRC_FILES:= $(deviceSources)
 LOCAL_C_INCLUDES := \
     external/zlib \
     system/core/include
-LOCAL_STATIC_LIBRARIES := libziparchive
+LOCAL_STATIC_LIBRARIES := libziparchive libbase
 LOCAL_SHARED_LIBRARIES := \
     libbinder \
     liblog \
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 9956bd7a8cc1f..dc3ad255be04a 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -64,7 +64,8 @@ aaptHostStaticLibs := \
     libutils \
     libcutils \
     libexpat \
-    libziparchive-host
+    libziparchive-host \
+    libbase
 
 aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER)\"
 aaptCFlags += -Wall -Werror
diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index 013e570fc35e0..d9ddf08862b3a 100644
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -52,7 +52,8 @@ hostStaticLibs := \
     libutils \
     libcutils \
     libexpat \
-    libziparchive-host
+    libziparchive-host \
+    libbase
 
 cFlags := -Wall -Werror