| 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'],
|
| + }],
|
| ],
|
| },
|
| #
|
|
|