diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 18:15:11 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 18:15:11 +0000 |
| commit | 7fc96c8b734fc9bc8152329d99e8ee3f3de14a65 (patch) | |
| tree | ba2a19ba2e69e046ed0c4df314f7737230ca42b7 /base/logging.h | |
| parent | 94f48cb8bcbb60bc40f4056cd19e1b0233742ff7 (diff) | |
| download | chromium_src-7fc96c8b734fc9bc8152329d99e8ee3f3de14a65.zip chromium_src-7fc96c8b734fc9bc8152329d99e8ee3f3de14a65.tar.gz chromium_src-7fc96c8b734fc9bc8152329d99e8ee3f3de14a65.tar.bz2 | |
Revert 147986 - [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
TBR=yfriedman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10816039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.h')
| -rw-r--r-- | base/logging.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/base/logging.h b/base/logging.h index 6ea430d..46eca37 100644 --- a/base/logging.h +++ b/base/logging.h @@ -949,13 +949,9 @@ 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 |