diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 23:22:25 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 23:22:25 +0000 |
| commit | 65fd16aadafd257320a6fcf6945e252b117a9c3c (patch) | |
| tree | 126a002665ddd8702fd48ddab1cecba06f3d1e6d /base/logging.h | |
| parent | 6e6a8aad911a8b2ba14f98062a99faa065cf9249 (diff) | |
| download | chromium_src-65fd16aadafd257320a6fcf6945e252b117a9c3c.zip chromium_src-65fd16aadafd257320a6fcf6945e252b117a9c3c.tar.gz chromium_src-65fd16aadafd257320a6fcf6945e252b117a9c3c.tar.bz2 | |
[Android] Add remaining build/common.gypi changes from downstream and strip NOTIMPLEMENTED()s from official builds.
Includes:
1) Allowing overridding of android_ndk_sysroot (addition of "%" in
variable name).
2) Disable NOTIMPLEMENTED output for official builds (see base/logging.h)
3) Add clang build configurations
4) Remove unnecessary cflags from regular build.
5) Include crtbegin_so.o and crtend_so.so for _type=="loadable_module"
which is needed for ppapi_tests.
BUG=137569
Review URL: https://chromiumcodereview.appspot.com/10808042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.h')
| -rw-r--r-- | base/logging.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/logging.h b/base/logging.h index 46eca37..6ea430d 100644 --- a/base/logging.h +++ b/base/logging.h @@ -949,9 +949,13 @@ inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) { // 5 -- LOG(ERROR) at runtime, only once per call-site #ifndef NOTIMPLEMENTED_POLICY +#if defined(OS_ANDROID) && defined(OFFICIAL_BUILD) +#define NOTIMPLEMENTED_POLICY 0 +#else // Select default policy: LOG(ERROR) #define NOTIMPLEMENTED_POLICY 4 #endif +#endif #if defined(COMPILER_GCC) // On Linux, with GCC, we can use __PRETTY_FUNCTION__ to get the demangled name |