diff options
| author | Arman Uguray <armansito@google.com> | 2015-07-08 15:22:51 -0700 |
|---|---|---|
| committer | Arman Uguray <armansito@google.com> | 2015-07-10 17:28:09 -0700 |
| commit | 6676e71f20c1f6987f8ab6bd151d5bbf69371c92 (patch) | |
| tree | 38ad699ed9d8b19534fa024cf92e8320c0c4a5a5 | |
| parent | 96074fa37c50405bb055408ea7753159eb9c3e50 (diff) | |
| download | libchrome-6676e71f20c1f6987f8ab6bd151d5bbf69371c92.tar.gz | |
Include base/base64.cc in the build.
Added base/base64.cc to the build. To successfully compile, added dependency to
libmodp64 which is needed by the base64 functions.
Dependent CL: http://r.android.com/159070
Bug: 22353299
Change-Id: Ibaabba51973b92d32cca9bc8c7e2e63741653c96
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | base/base64.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 84b2f04e67..a2c788d3cc 100644 --- a/Android.mk +++ b/Android.mk @@ -24,9 +24,10 @@ libchromeCommonCFlags := -D__BRILLO__ -Wall -Werror \ 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 @@ LOCAL_SRC_FILES := \ 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 8ed1249257..8230e2c651 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 { |