Commit 1cf4f7e9 authored by simonb@chromium.org's avatar simonb@chromium.org

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
parent 004f26fd
...@@ -1411,10 +1411,10 @@ ...@@ -1411,10 +1411,10 @@
'target_name': 'chromium_android_linker', 'target_name': 'chromium_android_linker',
'type': 'shared_library', 'type': 'shared_library',
'conditions': [ 'conditions': [
['android_webview_build == 0 and target_arch != "x64"', { # Avoid breaking the webview build because it
# Avoid breaking the webview build because it # does not have <(android_ndk_root)/crazy_linker.gyp.
# does not have <(android_ndk_root)/crazy_linker.gyp. # Note that webview never uses the linker anyway.
# Note that webview never uses the linker anyway. ['android_webview_build == 0', {
'sources': [ 'sources': [
'android/linker/linker_jni.cc', 'android/linker/linker_jni.cc',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment