Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Side by Side Diff: build/build_config.h

Issue 8135024: Make use_nss a gyp var so that aura can build w/ nss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review corrections Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file adds defines about the platform we're currently building on. 5 // This file adds defines about the platform we're currently building on.
6 // Operating System: 6 // Operating System:
7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) 7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX)
8 // Compiler: 8 // Compiler:
9 // COMPILER_MSVC / COMPILER_GCC 9 // COMPILER_MSVC / COMPILER_GCC
10 // Processor: 10 // Processor:
(...skipping 26 matching lines...) Expand all
37 #define OS_OPENBSD 1 37 #define OS_OPENBSD 1
38 #define TOOLKIT_GTK 38 #define TOOLKIT_GTK
39 #elif defined(__sun) 39 #elif defined(__sun)
40 #define OS_SOLARIS 1 40 #define OS_SOLARIS 1
41 #define TOOLKIT_GTK 41 #define TOOLKIT_GTK
42 #else 42 #else
43 #error Please add support for your platform in build/build_config.h 43 #error Please add support for your platform in build/build_config.h
44 #endif 44 #endif
45 45
46 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ 46 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \
47 defined(OS_SOLARIS) || defined(OS_ANDROID) 47 defined(OS_SOLARIS)
48 #if !defined(USE_OPENSSL)
49 #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen.
50 #endif
51 #ifndef OS_ANDROID
52 #define USE_X11 1 // Use X for graphics. 48 #define USE_X11 1 // Use X for graphics.
53 #endif 49 #endif
54 #endif
55 50
56 #if defined(USE_OPENSSL) && defined(USE_NSS) 51 #if defined(USE_OPENSSL) && defined(USE_NSS)
57 #error Cannot use both OpenSSL and NSS 52 #error Cannot use both OpenSSL and NSS
58 #endif 53 #endif
59 54
60 // For access to standard POSIXish features, use OS_POSIX instead of a 55 // For access to standard POSIXish features, use OS_POSIX instead of a
61 // more specific macro. 56 // more specific macro.
62 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ 57 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
63 defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ 58 defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \
64 defined(OS_NACL) 59 defined(OS_NACL)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 #if defined(OS_ANDROID) 133 #if defined(OS_ANDROID)
139 // The compiler thinks std::string::const_iterator and "const char*" are 134 // The compiler thinks std::string::const_iterator and "const char*" are
140 // equivalent types. 135 // equivalent types.
141 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 136 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
142 // The compiler thinks base::string16::const_iterator and "char16*" are 137 // The compiler thinks base::string16::const_iterator and "char16*" are
143 // equivalent types. 138 // equivalent types.
144 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 139 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
145 #endif 140 #endif
146 141
147 #endif // BUILD_BUILD_CONFIG_H_ 142 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698