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

Side by Side Diff: base/base.gyp

Issue 640363002: Make crazy linker work in gn build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome-shell-apk
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « base/android/BUILD.gn ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 'dependencies': [ 1397 'dependencies': [
1398 'base_java', 1398 'base_java',
1399 'base_java_test_support', 1399 'base_java_test_support',
1400 ], 1400 ],
1401 'variables': { 1401 'variables': {
1402 'java_in_dir': '../base/android/javatests', 1402 'java_in_dir': '../base/android/javatests',
1403 }, 1403 },
1404 'includes': [ '../build/java.gypi' ], 1404 'includes': [ '../build/java.gypi' ],
1405 }, 1405 },
1406 { 1406 {
1407 # TODO(GN) 1407 # GN: //base/android/chromium_android_linker
1408 'target_name': 'chromium_android_linker', 1408 'target_name': 'chromium_android_linker',
1409 'type': 'shared_library', 1409 'type': 'shared_library',
1410 'conditions': [ 1410 'conditions': [
1411 # Avoid breaking the webview build because it 1411 # Avoid breaking the webview build because it
1412 # does not have <(android_ndk_root)/crazy_linker.gyp. 1412 # does not have <(android_ndk_root)/crazy_linker.gyp.
1413 # Note that webview never uses the linker anyway. 1413 # Note that webview never uses the linker anyway.
1414 ['android_webview_build == 0', { 1414 ['android_webview_build == 0', {
1415 'sources': [ 1415 'sources': [
1416 'android/linker/linker_jni.cc', 1416 'android/linker/linker_jni.cc',
1417 ], 1417 ],
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 'dependencies': [ 1490 'dependencies': [
1491 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1491 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1492 ], 1492 ],
1493 }], 1493 }],
1494 ], 1494 ],
1495 }, 1495 },
1496 ], 1496 ],
1497 }], 1497 }],
1498 ], 1498 ],
1499 } 1499 }
OLDNEW
« no previous file with comments | « base/android/BUILD.gn ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698