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

Side by Side Diff: build/common.gypi

Issue 11419139: Suppress the use of thin archives with android-targeting builds since they break ndk-build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: incl android bug numbers in comment. Created 8 years 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 | Annotate | Revision Log
« 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 2589 matching lines...) Expand 10 before | Expand all | Expand 10 after
2600 'cflags!': [ 2600 'cflags!': [
2601 # Clang does not support the following options. 2601 # Clang does not support the following options.
2602 '-mthumb-interwork', 2602 '-mthumb-interwork',
2603 '-finline-limit=64', 2603 '-finline-limit=64',
2604 '-fno-tree-sra', 2604 '-fno-tree-sra',
2605 '-fuse-ld=gold', 2605 '-fuse-ld=gold',
2606 '-Wno-psabi', 2606 '-Wno-psabi',
2607 ], 2607 ],
2608 }], 2608 }],
2609 ], 2609 ],
2610 'target_conditions': [
2611 # ndk-build copies .a's around the filesystem, breaking
2612 # relative paths in thin archives. Disable using thin
2613 # archives to avoid problems until one of these is fixed:
2614 # http://code.google.com/p/android/issues/detail?id=40302
2615 # http://code.google.com/p/android/issues/detail?id=40303
2616 ['_type=="static_library"', {
2617 'standalone_static_library': 1,
2618 }],
2619 ],
2610 }], 2620 }],
2611 ], 2621 ],
2612 }], 2622 }],
2613 ], 2623 ],
2614 }], 2624 }],
2615 ['linux_fpic==1', { 2625 ['linux_fpic==1', {
2616 'cflags': [ 2626 'cflags': [
2617 '-fPIC', 2627 '-fPIC',
2618 ], 2628 ],
2619 'ldflags': [ 2629 'ldflags': [
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
3863 # settings in target dicts. SYMROOT is a special case, because many other 3873 # settings in target dicts. SYMROOT is a special case, because many other
3864 # Xcode variables depend on it, including variables such as 3874 # Xcode variables depend on it, including variables such as
3865 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3875 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3866 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3876 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3867 # files to appear (when present) in the UI as actual files and not red 3877 # files to appear (when present) in the UI as actual files and not red
3868 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3878 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3869 # and therefore SYMROOT, needs to be set at the project level. 3879 # and therefore SYMROOT, needs to be set at the project level.
3870 'SYMROOT': '<(DEPTH)/xcodebuild', 3880 'SYMROOT': '<(DEPTH)/xcodebuild',
3871 }, 3881 },
3872 } 3882 }
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