| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../build/win_precompile.gypi', | 10 '../build/win_precompile.gypi', |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 '../testing/gtest.gyp:gtest', | 659 '../testing/gtest.gyp:gtest', |
| 660 '../third_party/icu/icu.gyp:icui18n', | 660 '../third_party/icu/icu.gyp:icui18n', |
| 661 '../third_party/icu/icu.gyp:icuuc', | 661 '../third_party/icu/icu.gyp:icuuc', |
| 662 ], | 662 ], |
| 663 'includes': ['../build/nocompile.gypi'], | 663 'includes': ['../build/nocompile.gypi'], |
| 664 'variables': { | 664 'variables': { |
| 665 # TODO(ajwong): Is there a way to autodetect this? | 665 # TODO(ajwong): Is there a way to autodetect this? |
| 666 'module_dir': 'base' | 666 'module_dir': 'base' |
| 667 }, | 667 }, |
| 668 'conditions': [ | 668 'conditions': [ |
| 669 ['use_glib==1 or (OS == "android" and _toolset == "target")', { |
| 670 'defines': [ |
| 671 'USE_SYMBOLIZE', |
| 672 ], |
| 673 }], |
| 669 ['OS == "android"', { | 674 ['OS == "android"', { |
| 670 'dependencies': [ | 675 'dependencies': [ |
| 671 'android/jni_generator/jni_generator.gyp:jni_generator_tests', | 676 'android/jni_generator/jni_generator.gyp:jni_generator_tests', |
| 672 ], | 677 ], |
| 673 'conditions': [ | 678 'conditions': [ |
| 674 ['gtest_target_type == "shared_library"', { | 679 ['gtest_target_type == "shared_library"', { |
| 675 'dependencies': [ | 680 'dependencies': [ |
| 676 '../testing/android/native_test.gyp:native_test_native_code', | 681 '../testing/android/native_test.gyp:native_test_native_code', |
| 677 ], | 682 ], |
| 678 }], | 683 }], |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1298 'base_unittests.isolate', | 1303 'base_unittests.isolate', |
| 1299 ], | 1304 ], |
| 1300 'sources': [ | 1305 'sources': [ |
| 1301 'base_unittests.isolate', | 1306 'base_unittests.isolate', |
| 1302 ], | 1307 ], |
| 1303 }, | 1308 }, |
| 1304 ], | 1309 ], |
| 1305 }], | 1310 }], |
| 1306 ], | 1311 ], |
| 1307 } | 1312 } |
| OLD | NEW |