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

Side by Side Diff: build/common.gypi

Issue 576123002: Revert "[Android] Workaround for aarch64 NDK bug." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | no next file » | 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 3938 matching lines...) Expand 10 before | Expand all | Expand 10 after
3949 ], 3949 ],
3950 }], 3950 }],
3951 ['target_arch=="arm64"', { 3951 ['target_arch=="arm64"', {
3952 'target_conditions': [ 3952 'target_conditions': [
3953 ['_toolset=="target"', { 3953 ['_toolset=="target"', {
3954 'conditions': [ 3954 'conditions': [
3955 ['OS=="android"', { 3955 ['OS=="android"', {
3956 'cflags!': [ 3956 'cflags!': [
3957 '-fstack-protector', # stack protector is always enabled on arm64. 3957 '-fstack-protector', # stack protector is always enabled on arm64.
3958 ], 3958 ],
3959 # This is a workaround for a NDK bug (b/15574841) and
3960 # should be removed by the r10c-rc3 NDK roll.
3961 # Ping primiano@ if you see this after Oct 2014.
3962 'ldflags': [
3963 '-Wl,--dynamic-linker=/system/bin/linker64',
3964 ],
3965 }], 3959 }],
3966 ], 3960 ],
3967 }], 3961 }],
3968 ], 3962 ],
3969 }], 3963 }],
3970 ['target_arch=="mipsel"', { 3964 ['target_arch=="mipsel"', {
3971 'target_conditions': [ 3965 'target_conditions': [
3972 ['_toolset=="target"', { 3966 ['_toolset=="target"', {
3973 'conditions': [ 3967 'conditions': [
3974 ['android_webview_build==0 and mips_arch_variant=="r6"', { 3968 ['android_webview_build==0 and mips_arch_variant=="r6"', {
(...skipping 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after
5799 # settings in target dicts. SYMROOT is a special case, because many other 5793 # settings in target dicts. SYMROOT is a special case, because many other
5800 # Xcode variables depend on it, including variables such as 5794 # Xcode variables depend on it, including variables such as
5801 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5795 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5802 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5796 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5803 # files to appear (when present) in the UI as actual files and not red 5797 # files to appear (when present) in the UI as actual files and not red
5804 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5798 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5805 # and therefore SYMROOT, needs to be set at the project level. 5799 # and therefore SYMROOT, needs to be set at the project level.
5806 'SYMROOT': '<(DEPTH)/xcodebuild', 5800 'SYMROOT': '<(DEPTH)/xcodebuild',
5807 }, 5801 },
5808 } 5802 }
OLDNEW
« 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