| Index: base/base.gyp
 | 
| diff --git a/base/base.gyp b/base/base.gyp
 | 
| index 78f16903ba8582813c698b5a8015d73d32e27e10..3e4f9964bc75aa1a3b366bf4281c1ea61dd32d99 100644
 | 
| --- a/base/base.gyp
 | 
| +++ b/base/base.gyp
 | 
| @@ -132,7 +132,6 @@
 | 
|            ],
 | 
|            'dependencies': [
 | 
|              'base_jni_headers',
 | 
| -            'symbolize',
 | 
|              '../third_party/ashmem/ashmem.gyp:ashmem',
 | 
|            ],
 | 
|            'include_dirs': [
 | 
| @@ -143,9 +142,6 @@
 | 
|                '-llog',
 | 
|              ],
 | 
|            },
 | 
| -          'defines': [
 | 
| -            'USE_SYMBOLIZE',
 | 
| -          ],
 | 
|            'sources!': [
 | 
|              'debug/stack_trace_posix.cc',
 | 
|            ],
 | 
| @@ -668,7 +664,7 @@
 | 
|          'module_dir': 'base'
 | 
|        },
 | 
|        'conditions': [
 | 
| -        ['use_glib==1 or (OS == "android" and _toolset == "target")', {
 | 
| +        ['use_glib==1', {
 | 
|            'defines': [
 | 
|              'USE_SYMBOLIZE',
 | 
|            ],
 | 
| @@ -684,10 +680,6 @@
 | 
|                ],
 | 
|              }],
 | 
|            ],
 | 
| -          'sources!': [
 | 
| -            # Broken on Android, and already disabled there.
 | 
| -            'debug/stack_trace_unittest.cc',
 | 
| -          ],
 | 
|          }],
 | 
|          ['OS == "ios" and _toolset != "host"', {
 | 
|            'sources/': [
 | 
| 
 |