diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:43:08 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-19 14:47:02 +0000 |
| commit | d5335d37310036a1236ba3f4195afbdc55a85b5a (patch) | |
| tree | 08f7e49ebe9c88d0c70e3199b801e117b06059a0 /build | |
| parent | 513209b27ff55e2841eac0e4120199c23acce758 (diff) | |
| download | external_chromium-d5335d37310036a1236ba3f4195afbdc55a85b5a.zip external_chromium-d5335d37310036a1236ba3f4195afbdc55a85b5a.tar.gz external_chromium-d5335d37310036a1236ba3f4195afbdc55a85b5a.tar.bz2 | |
Merge Chromium at r65505: Fix conflicts.
build/build_config.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=63506
chrome/browser/autofill/personal_data_manager.h
chrome/browser/autofill/personal_data_manager.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=65100
chrome/common/extensions/docs/permission_warnings.html:
Git got confused :/
net/base/host_resolver_impl.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=64369
base/logging.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=65062
base/message_loop.cc:
http://src.chromium.org/viewvc/chrome?view=rev&revision=64975
Change-Id: Ied0356824b26ad7e6fea14fdc56cebb73b8b2f2a
Diffstat (limited to 'build')
| -rw-r--r-- | build/build_config.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/build/build_config.h b/build/build_config.h index 63dac1f..1e9745f 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -47,21 +47,20 @@ #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ defined(OS_SOLARIS) + +#if defined(ANDROID) +#define USE_OPENSSL 1 +#define USE_SYSTEM_ZLIB 1 +#endif + #if !defined(USE_OPENSSL) #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. #endif #define USE_X11 1 // Use X for graphics. #endif -<<<<<<< HEAD -#if defined(ANDROID) -#define USE_OPENSSL 1 -#undef USE_NSS -#define USE_SYSTEM_ZLIB 1 -======= #if defined(USE_OPENSSL) && defined(USE_NSS) #error Cannot use both OpenSSL and NSS ->>>>>>> chromium.org at r65505 #endif // For access to standard POSIXish features, use OS_POSIX instead of a |