diff options
author | Hidehiko Abe <hidehiko@google.com> | 2018-03-09 21:53:52 +0900 |
---|---|---|
committer | Hidehiko Abe <hidehiko@google.com> | 2018-03-09 21:53:52 +0900 |
commit | b1919cfb4a2ec955423e6cf8ccc6afabc8ffb3ed (patch) | |
tree | 3308b0533dc17dcf4fbc56acc74b48845af4e4a1 | |
parent | 31babce11bb4f466b4754956e05cf62f48060fa4 (diff) | |
download | libchrome-b1919cfb4a2ec955423e6cf8ccc6afabc8ffb3ed.tar.gz |
Remove unnecessary diffs from libchrome.
- Update build_config.h.
- platform_test.h had a modification to support Mac tests. Because we drop
Mac host support, that change is no longer needed.
Bug: 73270448
Test: Treehugger.
Change-Id: I82affa36a4e055368f08ee7554e38eedc61fa6e1
-rw-r--r-- | build/build_config.h | 36 | ||||
-rw-r--r-- | testing/platform_test.h | 11 |
2 files changed, 37 insertions, 10 deletions
diff --git a/build/build_config.h b/build/build_config.h index 80a93d3d43..219b0e2ad9 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -6,6 +6,7 @@ // Operating System: // OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) / // OS_NACL (NACL_SFI or NACL_NONSFI) / OS_NACL_SFI / OS_NACL_NONSFI +// OS_CHROMEOS is set by the build system // Compiler: // COMPILER_MSVC / COMPILER_GCC // Processor: @@ -84,9 +85,10 @@ #endif #elif defined(_WIN32) #define OS_WIN 1 -#define TOOLKIT_VIEWS 1 #elif defined(__FreeBSD__) #define OS_FREEBSD 1 +#elif defined(__NetBSD__) +#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(__sun) @@ -103,15 +105,16 @@ // For access to standard BSD features, use OS_BSD instead of a // more specific macro. -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) +#if defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD) #define OS_BSD 1 #endif // 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_ANDROID) || \ - defined(OS_NACL) || defined(OS_QNX) + defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || \ + defined(OS_ANDROID) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || \ + defined(OS_ANDROID) || defined(OS_NACL) || defined(OS_QNX) #define OS_POSIX 1 #endif @@ -144,6 +147,31 @@ #define ARCH_CPU_X86 1 #define ARCH_CPU_32_BITS 1 #define ARCH_CPU_LITTLE_ENDIAN 1 +#elif defined(__s390x__) +#define ARCH_CPU_S390_FAMILY 1 +#define ARCH_CPU_S390X 1 +#define ARCH_CPU_64_BITS 1 +#define ARCH_CPU_BIG_ENDIAN 1 +#elif defined(__s390__) +#define ARCH_CPU_S390_FAMILY 1 +#define ARCH_CPU_S390 1 +#define ARCH_CPU_31_BITS 1 +#define ARCH_CPU_BIG_ENDIAN 1 +#elif defined(__PPC64__) && defined(__BIG_ENDIAN__) +#define ARCH_CPU_PPC64_FAMILY 1 +#define ARCH_CPU_PPC64 1 +#define ARCH_CPU_64_BITS 1 +#define ARCH_CPU_BIG_ENDIAN 1 +#elif defined(__PPC64__) && defined(__LITTLE_ENDIAN__) +#define ARCH_CPU_PPC64_FAMILY 1 +#define ARCH_CPU_PPC64 1 +#define ARCH_CPU_64_BITS 1 +#define ARCH_CPU_LITTLE_ENDIAN 1 +#elif defined(__PPC__) +#define ARCH_CPU_PPC_FAMILY 1 +#define ARCH_CPU_PPC 1 +#define ARCH_CPU_32_BITS 1 +#define ARCH_CPU_BIG_ENDIAN 1 #elif defined(__ARMEL__) #define ARCH_CPU_ARM_FAMILY 1 #define ARCH_CPU_ARMEL 1 diff --git a/testing/platform_test.h b/testing/platform_test.h index 04fc845bd9..f993864d61 100644 --- a/testing/platform_test.h +++ b/testing/platform_test.h @@ -8,11 +8,7 @@ #include <gtest/gtest.h> #if defined(GTEST_OS_MAC) -#ifdef __OBJC__ -@class NSAutoreleasePool; -#else -class NSAutoreleasePool; -#endif +#include <objc/objc.h> // The purpose of this class us to provide a hook for platform-specific // operations across unit tests. For example, on the Mac, it creates and @@ -27,7 +23,10 @@ class PlatformTest : public testing::Test { PlatformTest(); private: - NSAutoreleasePool* pool_; + // |pool_| is a NSAutoreleasePool, but since this header may be imported from + // files built with Objective-C ARC that forbids explicit usage of + // NSAutoreleasePools, it is declared as id here. + id pool_; }; #else typedef testing::Test PlatformTest; |