| 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 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1416 'dependencies': [ | 1416 'dependencies': [ |
| 1417 'base_java', | 1417 'base_java', |
| 1418 'base_java_test_support', | 1418 'base_java_test_support', |
| 1419 ], | 1419 ], |
| 1420 'variables': { | 1420 'variables': { |
| 1421 'java_in_dir': '../base/android/javatests', | 1421 'java_in_dir': '../base/android/javatests', |
| 1422 }, | 1422 }, |
| 1423 'includes': [ '../build/java.gypi' ], | 1423 'includes': [ '../build/java.gypi' ], |
| 1424 }, | 1424 }, |
| 1425 { | 1425 { |
| 1426 # GN: //base/android/chromium_android_linker | 1426 # GN: //base/android/linker:chromium_android_linker |
| 1427 'target_name': 'chromium_android_linker', | 1427 'target_name': 'chromium_android_linker', |
| 1428 'type': 'shared_library', | 1428 'type': 'shared_library', |
| 1429 'conditions': [ | 1429 'conditions': [ |
| 1430 # Avoid breaking the webview build because it | 1430 # Avoid breaking the webview build because it |
| 1431 # does not have <(android_ndk_root)/crazy_linker.gyp. | 1431 # does not have <(android_ndk_root)/crazy_linker.gyp. |
| 1432 # Note that webview never uses the linker anyway. | 1432 # Note that webview never uses the linker anyway. |
| 1433 ['android_webview_build == 0', { | 1433 ['android_webview_build == 0', { |
| 1434 'sources': [ | 1434 'sources': [ |
| 1435 'android/linker/linker_jni.cc', | 1435 'android/linker/linker_jni.cc', |
| 1436 ], | 1436 ], |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1509 'dependencies': [ | 1509 'dependencies': [ |
| 1510 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 1510 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 1511 ], | 1511 ], |
| 1512 }], | 1512 }], |
| 1513 ], | 1513 ], |
| 1514 }, | 1514 }, |
| 1515 ], | 1515 ], |
| 1516 }], | 1516 }], |
| 1517 ], | 1517 ], |
| 1518 } | 1518 } |
| OLD | NEW |