commit 708b31138646a8ece941c678f40265a3e987ee6a
author Dan Albert <danalbert@google.com> Tue Mar 24 02:59:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 24 02:59:29 2015 +0000
tree 0c2bdea666425da4bbd43bd649b6c0cec591d625
parent 9eb7ad0bbbbe3a7e9692b87dcdbda0c8dc900886
parent 8ba55932f453d57744879aa5d4fa0ced1e8ea4be

am 497b044e: am 9b2aba07: am ec574408: Merge "(Probably) fix the mac build."

* commit '497b044e4bbb986cb612c3336e37ecbe472ca08e':
  (Probably) fix the mac build.

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 2c5e351..876b89d 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -68,7 +68,7 @@
 # ========================================================
 LOCAL_MODULE := libcutils
 LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
-LOCAL_STATIC_LIBRARIES := liblog
+LOCAL_STATIC_LIBRARIES := liblog libbase
 ifneq ($(HOST_OS),windows)
 LOCAL_CFLAGS += -Werror
 endif