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

Side by Side Diff: base/base.gyp

Issue 330253003: Use the local crazy_linker source fork in place of the NDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Note the fork switch bug id in base.gyp Created 6 years, 6 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 | « no previous file | third_party/android_crazy_linker/crazy_linker.gyp » ('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 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 # Note that webview never uses the linker anyway. 1420 # Note that webview never uses the linker anyway.
1421 # Note there is no 64-bit support in the linker. 1421 # Note there is no 64-bit support in the linker.
1422 'sources': [ 1422 'sources': [
1423 'android/linker/linker_jni.cc', 1423 'android/linker/linker_jni.cc',
1424 ], 1424 ],
1425 # The crazy linker is never instrumented. 1425 # The crazy linker is never instrumented.
1426 'cflags!': [ 1426 'cflags!': [
1427 '-finstrument-functions', 1427 '-finstrument-functions',
1428 ], 1428 ],
1429 'dependencies': [ 1429 'dependencies': [
1430 '<(android_ndk_root)/crazy_linker.gyp:crazy_linker', 1430 # The NDK contains the crazy_linker here:
1431 # '<(android_ndk_root)/crazy_linker.gyp:crazy_linker'
1432 # However, we use our own fork. See bug 384700.
1433 '../third_party/android_crazy_linker/crazy_linker.gyp:crazy_link er',
1431 ], 1434 ],
1432 }], 1435 }],
1433 ], 1436 ],
1434 }, 1437 },
1435 1438
1436 ], 1439 ],
1437 }], 1440 }],
1438 ['OS == "android"', { 1441 ['OS == "android"', {
1439 'targets': [ 1442 'targets': [
1440 { 1443 {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1495 'base_unittests.isolate', 1498 'base_unittests.isolate',
1496 ], 1499 ],
1497 'sources': [ 1500 'sources': [
1498 'base_unittests.isolate', 1501 'base_unittests.isolate',
1499 ], 1502 ],
1500 }, 1503 },
1501 ], 1504 ],
1502 }], 1505 }],
1503 ], 1506 ],
1504 } 1507 }
OLDNEW
« no previous file with comments | « no previous file | third_party/android_crazy_linker/crazy_linker.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698