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

Side by Side Diff: build/build_config.h

Issue 538563002: Don't include TargetConditionals.h when building for android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment to explain why Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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) / OS_NACL 7 // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) / OS_NACL
8 // Compiler: 8 // Compiler:
9 // COMPILER_MSVC / COMPILER_GCC 9 // COMPILER_MSVC / COMPILER_GCC
10 // Processor: 10 // Processor:
11 // ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) 11 // ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64)
12 // ARCH_CPU_32_BITS / ARCH_CPU_64_BITS 12 // ARCH_CPU_32_BITS / ARCH_CPU_64_BITS
13 13
14 #ifndef BUILD_BUILD_CONFIG_H_ 14 #ifndef BUILD_BUILD_CONFIG_H_
15 #define BUILD_BUILD_CONFIG_H_ 15 #define BUILD_BUILD_CONFIG_H_
16 16
17 #if defined(__APPLE__)
18 #include <TargetConditionals.h>
19 #endif
20
21 // A set of macros to use for platform detection. 17 // A set of macros to use for platform detection.
22 #if defined(__native_client__) 18 #if defined(__native_client__)
23 // __native_client__ must be first, so that other OS_ defines are not set. 19 // __native_client__ must be first, so that other OS_ defines are not set.
24 #define OS_NACL 1 20 #define OS_NACL 1
25 #elif defined(ANDROID) 21 #elif defined(ANDROID)
26 #define OS_ANDROID 1 22 #define OS_ANDROID 1
27 #elif defined(__APPLE__) 23 #elif defined(__APPLE__)
24 // only include TargetConditions after testing ANDROID as some android builds
25 // on mac don't have this header available and it's not needed unless the target
26 // is really mac/ios.
27 #include <TargetConditionals.h>
28 #define OS_MACOSX 1 28 #define OS_MACOSX 1
29 #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE 29 #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
30 #define OS_IOS 1 30 #define OS_IOS 1
31 #endif // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE 31 #endif // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
32 #elif defined(__linux__) 32 #elif defined(__linux__)
33 #define OS_LINUX 1 33 #define OS_LINUX 1
34 // include a system header to pull in features.h for glibc/uclibc macros. 34 // include a system header to pull in features.h for glibc/uclibc macros.
35 #include <unistd.h> 35 #include <unistd.h>
36 #if defined(__GLIBC__) && !defined(__UCLIBC__) 36 #if defined(__GLIBC__) && !defined(__UCLIBC__)
37 // we really are using glibc, not uClibc pretending to be glibc 37 // we really are using glibc, not uClibc pretending to be glibc
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #if defined(OS_ANDROID) 150 #if defined(OS_ANDROID)
151 // The compiler thinks std::string::const_iterator and "const char*" are 151 // The compiler thinks std::string::const_iterator and "const char*" are
152 // equivalent types. 152 // equivalent types.
153 #define STD_STRING_ITERATOR_IS_CHAR_POINTER 153 #define STD_STRING_ITERATOR_IS_CHAR_POINTER
154 // The compiler thinks base::string16::const_iterator and "char16*" are 154 // The compiler thinks base::string16::const_iterator and "char16*" are
155 // equivalent types. 155 // equivalent types.
156 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER 156 #define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER
157 #endif 157 #endif
158 158
159 #endif // BUILD_BUILD_CONFIG_H_ 159 #endif // BUILD_BUILD_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698