diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 19:13:10 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 19:13:10 +0000 |
| commit | be16cf2bcf61a6ac255c347a6ba8c65d213a5a11 (patch) | |
| tree | 2b1ddc1ec5d6917f09afad312c18ec5448feb248 /build | |
| parent | b9c587d5a7e5d0a6c669b4fd2fd6d09985b26a2f (diff) | |
| download | chromium_src-be16cf2bcf61a6ac255c347a6ba8c65d213a5a11.zip chromium_src-be16cf2bcf61a6ac255c347a6ba8c65d213a5a11.tar.gz chromium_src-be16cf2bcf61a6ac255c347a6ba8c65d213a5a11.tar.bz2 | |
Upstream android string implementation etc.
BUG=
TEST=
Review URL: http://codereview.chromium.org/7238018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/build/build_config.h b/build/build_config.h index 3742a080..6f412c7 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -17,6 +17,8 @@ // A set of macros to use for platform detection. #if defined(__APPLE__) #define OS_MACOSX 1 +#elif defined(ANDROID) +#define OS_ANDROID 1 #elif defined(__native_client__) #define OS_NACL 1 #elif defined(__linux__) @@ -48,12 +50,14 @@ #endif #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ - defined(OS_SOLARIS) + defined(OS_SOLARIS) || defined(OS_ANDROID) #if !defined(USE_OPENSSL) #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. #endif +#ifndef OS_ANDROID #define USE_X11 1 // Use X for graphics. #endif +#endif #if defined(USE_OPENSSL) && defined(USE_NSS) #error Cannot use both OpenSSL and NSS @@ -61,8 +65,9 @@ // For access to standard POSIXish features, use OS_POSIX instead of a // more specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ - defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ + defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ + defined(OS_NACL) #define OS_POSIX 1 // Use base::DataPack for name/value pairs. #define USE_BASE_DATA_PACK 1 @@ -136,4 +141,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_ |