diff options
| author | simonb@chromium.org <simonb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 18:13:47 +0000 |
|---|---|---|
| committer | simonb@chromium.org <simonb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 18:13:47 +0000 |
| commit | b7dbdaf7d0221cdbe373a4ec9917a1b0d879377f (patch) | |
| tree | 60912de25d3e6a4fc45819d9d7200da1a5d9ac7e | |
| parent | 62245aeb44328e7893e04c0a963f065ac130656c (diff) | |
| download | chromium_src-b7dbdaf7d0221cdbe373a4ec9917a1b0d879377f.zip chromium_src-b7dbdaf7d0221cdbe373a4ec9917a1b0d879377f.tar.gz chromium_src-b7dbdaf7d0221cdbe373a4ec9917a1b0d879377f.tar.bz2 | |
Enable the crazy linker for arm64.
Turn off the check that disables the chromium linker on arm64.
BUG=369133
Review URL: https://codereview.chromium.org/368583003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280846 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/base/base.gyp b/base/base.gyp index 9f60e25..0d42bee 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1411,12 +1411,10 @@ 'target_name': 'chromium_android_linker', 'type': 'shared_library', 'conditions': [ - ['android_webview_build == 0 and target_arch != "x64" and \ - target_arch != "arm64"', { - # Avoid breaking the webview/64-bit build because they - # don't have <(android_ndk_root)/crazy_linker.gyp. + ['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. - # Note there is no 64-bit support in the linker. 'sources': [ 'android/linker/linker_jni.cc', ], |