Merge "Make MessageLoopForIO work with -fno-rtti."
diff --git a/Android.mk b/Android.mk
index 84b2f04..a2c788d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,9 +24,10 @@
libchromeCommonCppFlags := -Wno-deprecated-register -Wno-sign-promo
libchromeCommonCIncludes := \
external/gmock/include \
- external/gtest/include
+ external/gtest/include \
+ external/modp_b64
libchromeCommonSharedLibraries := libevent
-libchromeCommonStaticLibraries :=
+libchromeCommonStaticLibraries := libmodpb64
# libchrome shared library for target
# ========================================================
@@ -37,6 +38,7 @@
base/allocator/type_profiler_control.cc \
base/at_exit.cc \
base/atomicops_internals_x86_gcc.cc \
+ base/base64.cc \
base/base_switches.cc \
base/bind_helpers.cc \
base/build_time.cc \
diff --git a/base/base64.cc b/base/base64.cc
index 8ed1249..8230e2c 100644
--- a/base/base64.cc
+++ b/base/base64.cc
@@ -4,7 +4,7 @@
#include "base/base64.h"
-#include "third_party/modp_b64/modp_b64.h"
+#include <modp_b64.h>
namespace base {