From 1cf4f7e94f8f8f79cd72b0fb69664e18d4e803e2 Mon Sep 17 00:00:00 2001 From: "simonb@chromium.org" Date: Thu, 14 Aug 2014 20:07:34 +0000 Subject: [PATCH] Remove restriction on x64 chromium linker builds. As of r287591 the android chromium linker supports EM_X86_64 and x86_64 relocations. Remove the restriction preventing libchromium_android_linker.so building when arch=x64. BUG=369133 Review URL: https://codereview.chromium.org/470133003 Cr-Commit-Position: refs/heads/master@{#289683} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289683 0039d316-1c4b-4281-b951-d872f2087c98 --- base/base.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/base.gyp b/base/base.gyp index 779564a61ccd..ee19b8b4f8d9 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1411,10 +1411,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', ], -- 2.11.4.GIT