diff options
| author | John Reck <jreck@google.com> | 2012-02-22 17:41:36 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-02-23 10:30:53 -0800 |
| commit | a7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51 (patch) | |
| tree | 89f744b6727cb92b1ec1bffd13511d16a7e90209 /build | |
| parent | 4f3a742b60841cf402cd4192bd864afb7306356b (diff) | |
| download | external_chromium-a7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51.zip external_chromium-a7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51.tar.gz external_chromium-a7dee89fba4aaa5f0be152cfc7c7b9b5cff98d51.tar.bz2 | |
Import content and address detector support
Change-Id: Iea123dd9b46b067105f945acd9e7ba8ba4421cf9
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/build_config.h b/build/build_config.h index df16071..cedac01 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -54,6 +54,7 @@ #define USE_OPENSSL 1 #define USE_SYSTEM_ZLIB 1 #define USE_SYSTEM_SQLITE 1 +#define OS_ANDROID 1 #endif #if !defined(USE_OPENSSL) @@ -145,4 +146,13 @@ //define CROS_FONTS_USING_BCI #endif +#if defined(OS_ANDROID) +// The compiler thinks std::string::const_iterator and "const char*" are +// equivalent types. +#define STD_STRING_ITERATOR_IS_CHAR_POINTER +// The compiler thinks base::string16::const_iterator and "char16*" are +// equivalent types. +#define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER +#endif + #endif // BUILD_BUILD_CONFIG_H_ |