Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 2767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2778 # tombstone. Tools can determine the location of the archived symbols | 2778 # tombstone. Tools can determine the location of the archived symbols |
| 2779 # from the id. | 2779 # from the id. |
| 2780 'chrome_symbols_id%': '', | 2780 'chrome_symbols_id%': '', |
| 2781 'conditions': [ | 2781 'conditions': [ |
| 2782 # Use shared stlport library when system one used. | 2782 # Use shared stlport library when system one used. |
| 2783 # Figure this out early since it needs symbols from libgcc.a, so it | 2783 # Figure this out early since it needs symbols from libgcc.a, so it |
| 2784 # has to be before that in the set of libraries. | 2784 # has to be before that in the set of libraries. |
| 2785 ['use_system_stlport==1', { | 2785 ['use_system_stlport==1', { |
| 2786 'android_stlport_library': 'stlport', | 2786 'android_stlport_library': 'stlport', |
| 2787 }, { | 2787 }, { |
| 2788 'android_stlport_library': 'stlport_static', | 2788 'conditions': [ |
| 2789 ['component=="shared_library"', { | |
| 2790 'android_stlport_library': 'stlport_shared', | |
| 2791 }, { | |
| 2792 'android_stlport_library': 'stlport_static', | |
| 2793 }], | |
| 2794 ], | |
| 2789 }], | 2795 }], |
| 2790 ], | 2796 ], |
| 2791 | 2797 |
| 2792 # Placing this variable here prevents from forking libvpx, used | 2798 # Placing this variable here prevents from forking libvpx, used |
| 2793 # by remoting. Remoting is off, so it needn't built, | 2799 # by remoting. Remoting is off, so it needn't built, |
| 2794 # so forking it's deps seems like overkill. | 2800 # so forking it's deps seems like overkill. |
| 2795 # But this variable need defined to properly run gyp. | 2801 # But this variable need defined to properly run gyp. |
| 2796 # A proper solution is to have an OS==android conditional | 2802 # A proper solution is to have an OS==android conditional |
| 2797 # in third_party/libvpx/libvpx.gyp to define it. | 2803 # in third_party/libvpx/libvpx.gyp to define it. |
| 2798 'libvpx_path': 'lib/linux/arm', | 2804 'libvpx_path': 'lib/linux/arm', |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2872 'libraries': [ | 2878 'libraries': [ |
| 2873 '-l<(android_stlport_library)', | 2879 '-l<(android_stlport_library)', |
| 2874 # Manually link the libgcc.a that the cross compiler uses. | 2880 # Manually link the libgcc.a that the cross compiler uses. |
| 2875 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', | 2881 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', |
| 2876 '-lc', | 2882 '-lc', |
| 2877 '-ldl', | 2883 '-ldl', |
| 2878 '-lstdc++', | 2884 '-lstdc++', |
| 2879 '-lm', | 2885 '-lm', |
| 2880 ], | 2886 ], |
| 2881 'conditions': [ | 2887 'conditions': [ |
| 2888 ['component=="shared_library"', { | |
| 2889 'libraries': [ | |
| 2890 '-lgnustl_shared', | |
|
digit1
2012/11/20 20:33:19
sorry, didn't catch that earlier, but it's probabl
Yaron
2012/11/21 02:58:30
Probably true but since this is just in bring-up p
| |
| 2891 ], | |
| 2892 }], | |
| 2882 ['android_upstream_bringup==1', { | 2893 ['android_upstream_bringup==1', { |
| 2883 'defines': ['ANDROID_UPSTREAM_BRINGUP=1',], | 2894 'defines': ['ANDROID_UPSTREAM_BRINGUP=1',], |
| 2884 }], | 2895 }], |
| 2885 ['clang==1', { | 2896 ['clang==1', { |
| 2886 'cflags': [ | 2897 'cflags': [ |
| 2887 # Work around incompatibilities between bionic and clang | 2898 # Work around incompatibilities between bionic and clang |
| 2888 # headers. | 2899 # headers. |
| 2889 '-D__compiler_offsetof=__builtin_offsetof', | 2900 '-D__compiler_offsetof=__builtin_offsetof', |
| 2890 '-Dnan=__builtin_nan', | 2901 '-Dnan=__builtin_nan', |
| 2891 ], | 2902 ], |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2993 '-I<(android_src)/external/stlport/stlport', | 3004 '-I<(android_src)/external/stlport/stlport', |
| 2994 ], | 3005 ], |
| 2995 }, { # else: use_system_stlport!=1 | 3006 }, { # else: use_system_stlport!=1 |
| 2996 'cflags': [ | 3007 'cflags': [ |
| 2997 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport', | 3008 '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport', |
| 2998 ], | 3009 ], |
| 2999 'conditions': [ | 3010 'conditions': [ |
| 3000 ['target_arch=="arm" and armv7==1', { | 3011 ['target_arch=="arm" and armv7==1', { |
| 3001 'ldflags': [ | 3012 'ldflags': [ |
| 3002 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i-v7a', | 3013 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i-v7a', |
| 3014 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/armeabi-v7a', | |
| 3003 ], | 3015 ], |
| 3004 }], | 3016 }], |
| 3005 ['target_arch=="arm" and armv7==0', { | 3017 ['target_arch=="arm" and armv7==0', { |
| 3006 'ldflags': [ | 3018 'ldflags': [ |
| 3007 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i', | 3019 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeab i', |
| 3020 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/armeabi', | |
| 3008 ], | 3021 ], |
| 3009 }], | 3022 }], |
| 3010 ['target_arch=="ia32"', { | 3023 ['target_arch=="ia32"', { |
| 3011 'ldflags': [ | 3024 'ldflags': [ |
| 3012 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/x86', | 3025 '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/x86', |
| 3026 '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/l ibs/x86', | |
| 3013 ], | 3027 ], |
| 3014 }], | 3028 }], |
| 3015 ], | 3029 ], |
| 3016 }], | 3030 }], |
| 3017 ['target_arch=="ia32"', { | 3031 ['target_arch=="ia32"', { |
| 3018 # The x86 toolchain currently has problems with stack-protector. | 3032 # The x86 toolchain currently has problems with stack-protector. |
| 3019 'cflags!': [ | 3033 'cflags!': [ |
| 3020 '-fstack-protector', | 3034 '-fstack-protector', |
| 3021 ], | 3035 ], |
| 3022 'cflags': [ | 3036 'cflags': [ |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3787 # settings in target dicts. SYMROOT is a special case, because many other | 3801 # settings in target dicts. SYMROOT is a special case, because many other |
| 3788 # Xcode variables depend on it, including variables such as | 3802 # Xcode variables depend on it, including variables such as |
| 3789 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3803 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3790 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3804 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3791 # files to appear (when present) in the UI as actual files and not red | 3805 # files to appear (when present) in the UI as actual files and not red |
| 3792 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3806 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3793 # and therefore SYMROOT, needs to be set at the project level. | 3807 # and therefore SYMROOT, needs to be set at the project level. |
| 3794 'SYMROOT': '<(DEPTH)/xcodebuild', | 3808 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3795 }, | 3809 }, |
| 3796 } | 3810 } |
| OLD | NEW |