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

Side by Side Diff: build/common.gypi

Issue 11516017: Include gnu-libstdc++/include in -I paths for android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 3088 matching lines...) Expand 10 before | Expand all | Expand 10 after
3099 # The include ordering here is important; change with caution. 3099 # The include ordering here is important; change with caution.
3100 ['use_system_stlport==1', { 3100 ['use_system_stlport==1', {
3101 'cflags': [ 3101 'cflags': [
3102 # For libstdc++/include, which is used by stlport. 3102 # For libstdc++/include, which is used by stlport.
3103 '-I<(android_src)/bionic', 3103 '-I<(android_src)/bionic',
3104 '-I<(android_src)/external/stlport/stlport', 3104 '-I<(android_src)/external/stlport/stlport',
3105 ], 3105 ],
3106 }, { # else: use_system_stlport!=1 3106 }, { # else: use_system_stlport!=1
3107 'cflags': [ 3107 'cflags': [
3108 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport', 3108 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport',
3109 '-I<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/inclu de',
3109 ], 3110 ],
3110 'conditions': [ 3111 'conditions': [
3111 ['target_arch=="arm" and armv7==1', { 3112 ['target_arch=="arm" and armv7==1', {
3112 'ldflags': [ 3113 'ldflags': [
3113 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i-v7a', 3114 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i-v7a',
3114 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/armeabi-v7a', 3115 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/armeabi-v7a',
3115 ], 3116 ],
3116 }], 3117 }],
3117 ['target_arch=="arm" and armv7==0', { 3118 ['target_arch=="arm" and armv7==0', {
3118 'ldflags': [ 3119 'ldflags': [
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
3920 # settings in target dicts. SYMROOT is a special case, because many other 3921 # settings in target dicts. SYMROOT is a special case, because many other
3921 # Xcode variables depend on it, including variables such as 3922 # Xcode variables depend on it, including variables such as
3922 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3923 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3923 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3924 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3924 # files to appear (when present) in the UI as actual files and not red 3925 # files to appear (when present) in the UI as actual files and not red
3925 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3926 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3926 # and therefore SYMROOT, needs to be set at the project level. 3927 # and therefore SYMROOT, needs to be set at the project level.
3927 'SYMROOT': '<(DEPTH)/xcodebuild', 3928 'SYMROOT': '<(DEPTH)/xcodebuild',
3928 }, 3929 },
3929 } 3930 }
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