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

Side by Side Diff: build/common.gypi

Issue 556313003: [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 3929 matching lines...) Expand 10 before | Expand all | Expand 10 after
3940 ], 3940 ],
3941 }], 3941 }],
3942 ['target_arch=="arm64"', { 3942 ['target_arch=="arm64"', {
3943 'target_conditions': [ 3943 'target_conditions': [
3944 ['_toolset=="target"', { 3944 ['_toolset=="target"', {
3945 'conditions': [ 3945 'conditions': [
3946 ['OS=="android"', { 3946 ['OS=="android"', {
3947 'cflags!': [ 3947 'cflags!': [
3948 '-fstack-protector', # stack protector is always enabled on arm64. 3948 '-fstack-protector', # stack protector is always enabled on arm64.
3949 ], 3949 ],
3950 # This is a workaround for a NDK bug (b/15574841) and
3951 # should be removed by the r10c-rc3 NDK roll.
3952 # Ping primiano@ if you see this after Oct 2014.
3953 'ldflags': [
3954 '-Wl,--dynamic-linker=/system/bin/linker64',
3955 ],
3950 }], 3956 }],
3951 ], 3957 ],
3952 }], 3958 }],
3953 ], 3959 ],
3954 }], 3960 }],
3955 ['target_arch=="mipsel"', { 3961 ['target_arch=="mipsel"', {
3956 'target_conditions': [ 3962 'target_conditions': [
3957 ['_toolset=="target"', { 3963 ['_toolset=="target"', {
3958 'conditions': [ 3964 'conditions': [
3959 ['android_webview_build==0 and mips_arch_variant=="r6"', { 3965 ['android_webview_build==0 and mips_arch_variant=="r6"', {
(...skipping 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after
5784 # settings in target dicts. SYMROOT is a special case, because many other 5790 # settings in target dicts. SYMROOT is a special case, because many other
5785 # Xcode variables depend on it, including variables such as 5791 # Xcode variables depend on it, including variables such as
5786 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5792 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5787 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5793 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5788 # files to appear (when present) in the UI as actual files and not red 5794 # files to appear (when present) in the UI as actual files and not red
5789 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5795 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5790 # and therefore SYMROOT, needs to be set at the project level. 5796 # and therefore SYMROOT, needs to be set at the project level.
5791 'SYMROOT': '<(DEPTH)/xcodebuild', 5797 'SYMROOT': '<(DEPTH)/xcodebuild',
5792 }, 5798 },
5793 } 5799 }
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