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

Unified Diff: base/base.gyp

Issue 470133003: Remove restriction on x64 chromium linker builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index ce2c54f0a5427650430761fa38cc1d5bc5861c70..1cb9665a1be34193d6d3179c509c2c43dfd65e31 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1410,10 +1410,10 @@
'target_name': 'chromium_android_linker',
'type': 'shared_library',
'conditions': [
- ['android_webview_build == 0 and target_arch != "x64"', {
- # Avoid breaking the webview build because it
- # does not have <(android_ndk_root)/crazy_linker.gyp.
- # Note that webview never uses the linker anyway.
+ # Avoid breaking the webview build because it
+ # does not have <(android_ndk_root)/crazy_linker.gyp.
+ # Note that webview never uses the linker anyway.
+ ['android_webview_build == 0', {
'sources': [
'android/linker/linker_jni.cc',
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698