diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 07:16:56 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 07:16:56 +0000 |
| commit | cfd257f7c9c84849c80b56dc459c943842270311 (patch) | |
| tree | 2ad5ae7e3974f8ed432e5d414b4bf958778a4f17 /third_party | |
| parent | b1c90fb60ce158f4592b202e58c74ff736f6b4cf (diff) | |
| download | chromium_src-cfd257f7c9c84849c80b56dc459c943842270311.zip chromium_src-cfd257f7c9c84849c80b56dc459c943842270311.tar.gz chromium_src-cfd257f7c9c84849c80b56dc459c943842270311.tar.bz2 | |
Toward an android build of sync_unit_tests: OWNERS=evan
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9234048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/cld/base/build_config.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/third_party/cld/base/build_config.h b/third_party/cld/base/build_config.h index 1b26c16..3bb388c 100644 --- a/third_party/cld/base/build_config.h +++ b/third_party/cld/base/build_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -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(__linux__) #define OS_LINUX 1 // Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined. @@ -45,14 +47,18 @@ #define TOOLKIT_USES_GTK 1 #endif -#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ + defined(OS_ANDROID) #define USE_NSS 1 // Use NSS for crypto. +#ifndef OS_ANDROID #define USE_X11 1 // Use X for graphics. #endif +#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) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ + defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) #define OS_POSIX 1 // Use base::DataPack for name/value pairs. #define USE_BASE_DATA_PACK 1 |