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

Unified Diff: build/common.gypi

Issue 10695047: Enable debugging code for non-official Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/common/unittest_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index a84b8a7081938b08050b935178cf32ae5ccadfae..bd3d7c633041f58415b4f62466bffe32e02781a1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -943,8 +943,8 @@
# android_gyp
'android_unit_test_target_type%': 'static_library',
- # Choose static link by build type.
'conditions': [
+ # Choose static link by build type.
['android_build_type==0', {
'static_link_system_icu%': 1,
}, {
@@ -1883,6 +1883,10 @@
}],
],
}],
+ # Android enables DCHECK()s on non-Official release builds.
+ ['OS=="android" and buildtype!="Official"', {
+ 'defines!': ['NDEBUG'],
+ }],
],
},
#
« no previous file with comments | « no previous file | gpu/command_buffer/common/unittest_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698