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

Side by Side Diff: build/common.gypi

Issue 14993005: Fix static libraries will not be copied to product out directory issue on x86 Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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 2962 matching lines...) Expand 10 before | Expand all | Expand 10 after
2973 'cflags!': [ 2973 'cflags!': [
2974 # Clang does not support the following options. 2974 # Clang does not support the following options.
2975 '-mthumb-interwork', 2975 '-mthumb-interwork',
2976 '-finline-limit=64', 2976 '-finline-limit=64',
2977 '-fno-tree-sra', 2977 '-fno-tree-sra',
2978 '-fuse-ld=gold', 2978 '-fuse-ld=gold',
2979 '-Wno-psabi', 2979 '-Wno-psabi',
2980 ], 2980 ],
2981 }], 2981 }],
2982 ], 2982 ],
2983 'target_conditions': [
2984 # ndk-build copies .a's around the filesystem, breaking
2985 # relative paths in thin archives. Disable using thin
2986 # archives to avoid problems until one of these is fixed:
2987 # http://code.google.com/p/android/issues/detail?id=40302
2988 # http://code.google.com/p/android/issues/detail?id=40303
2989 ['_type=="static_library"', {
2990 'standalone_static_library': 1,
2991 }],
2992 ],
2993 }], 2983 }],
2994 ], 2984 ],
2995 }], 2985 }],
2996 ], 2986 ],
2997 }], 2987 }],
2998 ['target_arch=="mipsel"', { 2988 ['target_arch=="mipsel"', {
2999 'target_conditions': [ 2989 'target_conditions': [
3000 ['_toolset=="target"', { 2990 ['_toolset=="target"', {
3001 'conditions': [ 2991 'conditions': [
3002 ['mips_arch_variant=="mips32r2"', { 2992 ['mips_arch_variant=="mips32r2"', {
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
3613 '<(android_ndk_lib)/crtbegin_so.o', 3603 '<(android_ndk_lib)/crtbegin_so.o',
3614 ], 3604 ],
3615 'libraries': [ 3605 'libraries': [
3616 # crtend_so.o needs to be the last item in libraries. 3606 # crtend_so.o needs to be the last item in libraries.
3617 # Do not add any libraries after this! 3607 # Do not add any libraries after this!
3618 '<(android_ndk_lib)/crtend_so.o', 3608 '<(android_ndk_lib)/crtend_so.o',
3619 ], 3609 ],
3620 }], 3610 }],
3621 ], 3611 ],
3622 }], 3612 }],
3613 # ndk-build copies .a's around the filesystem, breaking
3614 # relative paths in thin archives. Disable using thin
3615 # archives to avoid problems until one of these is fixed:
3616 # http://code.google.com/p/android/issues/detail?id=40302
3617 # http://code.google.com/p/android/issues/detail?id=40303
3618 ['_type=="static_library"', {
3619 'standalone_static_library': 1,
3620 }],
3623 ], 3621 ],
3624 }], 3622 }],
3625 # Settings for building host targets using the system toolchain. 3623 # Settings for building host targets using the system toolchain.
3626 ['_toolset=="host"', { 3624 ['_toolset=="host"', {
3627 'cflags!': [ 3625 'cflags!': [
3628 # Due to issues in Clang build system, using ASan on 32-bit 3626 # Due to issues in Clang build system, using ASan on 32-bit
3629 # binaries on x86_64 host is problematic. 3627 # binaries on x86_64 host is problematic.
3630 # TODO(eugenis): re-enable. 3628 # TODO(eugenis): re-enable.
3631 '-fsanitize=address', 3629 '-fsanitize=address',
3632 '-w', # http://crbug.com/162783 3630 '-w', # http://crbug.com/162783
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
4446 # settings in target dicts. SYMROOT is a special case, because many other 4444 # settings in target dicts. SYMROOT is a special case, because many other
4447 # Xcode variables depend on it, including variables such as 4445 # Xcode variables depend on it, including variables such as
4448 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4446 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4449 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4447 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4450 # files to appear (when present) in the UI as actual files and not red 4448 # files to appear (when present) in the UI as actual files and not red
4451 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4449 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4452 # and therefore SYMROOT, needs to be set at the project level. 4450 # and therefore SYMROOT, needs to be set at the project level.
4453 'SYMROOT': '<(DEPTH)/xcodebuild', 4451 'SYMROOT': '<(DEPTH)/xcodebuild',
4454 }, 4452 },
4455 } 4453 }
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