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

Side by Side Diff: build/common.gypi

Issue 11312056: [Android] For shared library build, use shared versions of stlport and gnu_stl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 2686 matching lines...) Expand 10 before | Expand all | Expand 10 after
2697 'chrome_symbols_id%': '', 2697 'chrome_symbols_id%': '',
2698 'conditions': [ 2698 'conditions': [
2699 # Use shared stlport library when system one used. 2699 # Use shared stlport library when system one used.
2700 # Figure this out early since it needs symbols from libgcc.a, so it 2700 # Figure this out early since it needs symbols from libgcc.a, so it
2701 # has to be before that in the set of libraries. 2701 # has to be before that in the set of libraries.
2702 ['use_system_stlport==1', { 2702 ['use_system_stlport==1', {
2703 'android_stlport_library': 'stlport', 2703 'android_stlport_library': 'stlport',
2704 }, { 2704 }, {
2705 'android_stlport_library': 'stlport_static', 2705 'android_stlport_library': 'stlport_static',
2706 }], 2706 }],
2707 ['component=="shared_library" and use_system_stlport==0', {
nilesh 2012/11/06 18:37:04 I think this should go as a condition in the rule
2708 'android_stlport_library': 'stlport_shared',
2709 }],
2707 ], 2710 ],
2708 2711
2709 # Placing this variable here prevents from forking libvpx, used 2712 # Placing this variable here prevents from forking libvpx, used
2710 # by remoting. Remoting is off, so it needn't built, 2713 # by remoting. Remoting is off, so it needn't built,
2711 # so forking it's deps seems like overkill. 2714 # so forking it's deps seems like overkill.
2712 # But this variable need defined to properly run gyp. 2715 # But this variable need defined to properly run gyp.
2713 # A proper solution is to have an OS==android conditional 2716 # A proper solution is to have an OS==android conditional
2714 # in third_party/libvpx/libvpx.gyp to define it. 2717 # in third_party/libvpx/libvpx.gyp to define it.
2715 'libvpx_path': 'lib/linux/arm', 2718 'libvpx_path': 'lib/linux/arm',
2716 }, 2719 },
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
2789 'libraries': [ 2792 'libraries': [
2790 '-l<(android_stlport_library)', 2793 '-l<(android_stlport_library)',
2791 # Manually link the libgcc.a that the cross compiler uses. 2794 # Manually link the libgcc.a that the cross compiler uses.
2792 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', 2795 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
2793 '-lc', 2796 '-lc',
2794 '-ldl', 2797 '-ldl',
2795 '-lstdc++', 2798 '-lstdc++',
2796 '-lm', 2799 '-lm',
2797 ], 2800 ],
2798 'conditions': [ 2801 'conditions': [
2802 ['component=="shared_library"', {
2803 'libraries': [
2804 '-lgnustl_shared',
2805 ],
2806 }],
2799 ['android_upstream_bringup==1', { 2807 ['android_upstream_bringup==1', {
2800 'defines': ['ANDROID_UPSTREAM_BRINGUP=1',], 2808 'defines': ['ANDROID_UPSTREAM_BRINGUP=1',],
2801 }], 2809 }],
2802 ['clang==1', { 2810 ['clang==1', {
2803 'cflags': [ 2811 'cflags': [
2804 # Work around incompatibilities between bionic and clang 2812 # Work around incompatibilities between bionic and clang
2805 # headers. 2813 # headers.
2806 '-D__compiler_offsetof=__builtin_offsetof', 2814 '-D__compiler_offsetof=__builtin_offsetof',
2807 '-Dnan=__builtin_nan', 2815 '-Dnan=__builtin_nan',
2808 ], 2816 ],
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
2901 '-I<(android_src)/external/stlport/stlport', 2909 '-I<(android_src)/external/stlport/stlport',
2902 ], 2910 ],
2903 }, { # else: use_system_stlport!=1 2911 }, { # else: use_system_stlport!=1
2904 'cflags': [ 2912 'cflags': [
2905 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport', 2913 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport',
2906 ], 2914 ],
2907 'conditions': [ 2915 'conditions': [
2908 ['target_arch=="arm" and armv7==1', { 2916 ['target_arch=="arm" and armv7==1', {
2909 'ldflags': [ 2917 'ldflags': [
2910 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i-v7a', 2918 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i-v7a',
2919 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/armeabi-v7a',
2911 ], 2920 ],
2912 }], 2921 }],
2913 ['target_arch=="arm" and armv7==0', { 2922 ['target_arch=="arm" and armv7==0', {
2914 'ldflags': [ 2923 'ldflags': [
2915 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i', 2924 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i',
2925 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/armeabi',
2916 ], 2926 ],
2917 }], 2927 }],
2918 ['target_arch=="ia32"', { 2928 ['target_arch=="ia32"', {
2919 'ldflags': [ 2929 'ldflags': [
2920 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/x86', 2930 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/x86',
2931 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/x86',
2921 ], 2932 ],
2922 }], 2933 }],
2923 ], 2934 ],
2924 }], 2935 }],
2925 ['target_arch=="ia32"', { 2936 ['target_arch=="ia32"', {
2926 # The x86 toolchain currently has problems with stack-protector. 2937 # The x86 toolchain currently has problems with stack-protector.
2927 'cflags!': [ 2938 'cflags!': [
2928 '-fstack-protector', 2939 '-fstack-protector',
2929 ], 2940 ],
2930 'cflags': [ 2941 'cflags': [
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
3672 # settings in target dicts. SYMROOT is a special case, because many other 3683 # settings in target dicts. SYMROOT is a special case, because many other
3673 # Xcode variables depend on it, including variables such as 3684 # Xcode variables depend on it, including variables such as
3674 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3685 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3675 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3686 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3676 # files to appear (when present) in the UI as actual files and not red 3687 # files to appear (when present) in the UI as actual files and not red
3677 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3688 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3678 # and therefore SYMROOT, needs to be set at the project level. 3689 # and therefore SYMROOT, needs to be set at the project level.
3679 'SYMROOT': '<(DEPTH)/xcodebuild', 3690 'SYMROOT': '<(DEPTH)/xcodebuild',
3680 }, 3691 },
3681 } 3692 }
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