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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: common.gypi

Issue 10807048: Updated patch for mac/android xcompile Base URL: http://src.chromium.org/svn/trunk/src/build/
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
« android/envsetup.sh ('K') | « android/envsetup.sh ('k') | 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 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 'disable_nacl%': 0, 807 'disable_nacl%': 0,
808 808
809 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_ path))', 809 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_ path))',
810 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))', 810 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
811 811
812 'conditions': [ 812 'conditions': [
813 ['os_posix==1 and OS!="mac"', { 813 ['os_posix==1 and OS!="mac"', {
814 # This will set gcc_version to XY if you are running gcc X.Y.*. 814 # This will set gcc_version to XY if you are running gcc X.Y.*.
815 # This is used to tweak build flags for gcc 4.4. 815 # This is used to tweak build flags for gcc 4.4.
816 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 816 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
817 # Figure out the python architecture to decide if we build pyauto. 817 'conditions': [
Torne 2012/08/01 11:28:51 Break this out into a separate conditions section
818 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)', 818 ['HOST_OS!="mac"', {
819 » # Figure out the python architecture to decide if we build pyauto.
820 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/u sr/<(system_libdir)/libpython<(python_ver).so.1.0)',
821 }],
822 ],
819 'conditions': [ 823 'conditions': [
820 ['branding=="Chrome"', { 824 ['branding=="Chrome"', {
821 'linux_breakpad%': 1, 825 'linux_breakpad%': 1,
822 }], 826 }],
823 # All Chrome builds have breakpad symbols, but only process the 827 # All Chrome builds have breakpad symbols, but only process the
824 # symbols from official builds. 828 # symbols from official builds.
825 ['(branding=="Chrome" and buildtype=="Official")', { 829 ['(branding=="Chrome" and buildtype=="Official")', {
826 'linux_dump_symbols%': 1, 830 'linux_dump_symbols%': 1,
827 }], 831 }],
828 ], 832 ],
(...skipping 2266 matching lines...) Expand 10 before | Expand all | Expand 10 after
3095 ['clang==1 and OS!="android"', { 3099 ['clang==1 and OS!="android"', {
3096 'make_global_settings': [ 3100 'make_global_settings': [
3097 ['CC', '<(make_clang_dir)/bin/clang'], 3101 ['CC', '<(make_clang_dir)/bin/clang'],
3098 ['CXX', '<(make_clang_dir)/bin/clang++'], 3102 ['CXX', '<(make_clang_dir)/bin/clang++'],
3099 ['LINK', '$(CXX)'], 3103 ['LINK', '$(CXX)'],
3100 ['CC.host', '$(CC)'], 3104 ['CC.host', '$(CC)'],
3101 ['CXX.host', '$(CXX)'], 3105 ['CXX.host', '$(CXX)'],
3102 ['LINK.host', '$(LINK)'], 3106 ['LINK.host', '$(LINK)'],
3103 ], 3107 ],
3104 }], 3108 }],
3105 ['OS=="android" and "<(GENERATOR)"!="ninja"', { 3109 ['OS=="android" and "<(GENERATOR)"!="ninja" and HOST_OS!="mac"', {
3106 # Hardcode the compiler names in the Makefile so that 3110 # Hardcode the compiler names in the Makefile so that
3107 # it won't depend on the environment at make time. 3111 # it won't depend on the environment at make time.
3108 'make_global_settings': [ 3112 'make_global_settings': [
3109 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g cc)'], 3113 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g cc)'],
3110 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*- g++)'], 3114 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*- g++)'],
3111 ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/* -gcc)'], 3115 ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/* -gcc)'],
3112 ['CC.host', '<!(which gcc)'], 3116 ['CC.host', '<!(which gcc)'],
3113 ['CXX.host', '<!(which g++)'], 3117 ['CXX.host', '<!(which g++)'],
3114 ['LINK.host', '<!(which g++)'], 3118 ['LINK.host', '<!(which g++)'],
3115 ], 3119 ],
3116 }], 3120 }],
3121 ['OS=="android" and "<(GENERATOR)"!="ninja"', {
3122 'make_global_settings': [
3123 ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g cc)'],
3124 ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*- g++)'],
3125 ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/* -gcc)'],
3126 ['AR', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-a r)'],
3127 ['LD', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-l d)'],
3128 ['RANLIB', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN} /*-ranlib)'],
3129 ['CC.host', '<!(which gcc)'],
3130 ['CXX.host', '<!(which g++)'],
Torne 2012/08/01 11:28:51 Don't duplicate setting these to the same thing. W
luke.weber 2012/08/07 12:25:51 Disclaimer here, I'm building webrtc and libjingle
3131 ['LINK.host', '<!(which g++)'],
3132 ],
3133 }],
3117 ], 3134 ],
3118 'xcode_settings': { 3135 'xcode_settings': {
3119 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! 3136 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
3120 # This block adds *project-wide* configuration settings to each project 3137 # This block adds *project-wide* configuration settings to each project
3121 # file. It's almost always wrong to put things here. Specify your 3138 # file. It's almost always wrong to put things here. Specify your
3122 # custom xcode_settings in target_defaults to add them to targets instead. 3139 # custom xcode_settings in target_defaults to add them to targets instead.
3123 3140
3124 # In an Xcode Project Info window, the "Base SDK for All Configurations" 3141 # In an Xcode Project Info window, the "Base SDK for All Configurations"
3125 # setting sets the SDK on a project-wide basis. In order to get the 3142 # setting sets the SDK on a project-wide basis. In order to get the
3126 # configured SDK to show properly in the Xcode UI, SDKROOT must be set 3143 # configured SDK to show properly in the Xcode UI, SDKROOT must be set
3127 # here at the project level. 3144 # here at the project level.
3128 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot 3145 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
3129 3146
3130 # The Xcode generator will look for an xcode_settings section at the root 3147 # The Xcode generator will look for an xcode_settings section at the root
3131 # of each dict and use it to apply settings on a file-wide basis. Most 3148 # of each dict and use it to apply settings on a file-wide basis. Most
3132 # settings should not be here, they should be in target-specific 3149 # settings should not be here, they should be in target-specific
3133 # xcode_settings sections, or better yet, should use non-Xcode-specific 3150 # xcode_settings sections, or better yet, should use non-Xcode-specific
3134 # settings in target dicts. SYMROOT is a special case, because many other 3151 # settings in target dicts. SYMROOT is a special case, because many other
3135 # Xcode variables depend on it, including variables such as 3152 # Xcode variables depend on it, including variables such as
3136 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3153 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3137 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3154 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3138 # files to appear (when present) in the UI as actual files and not red 3155 # files to appear (when present) in the UI as actual files and not red
3139 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3156 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3140 # and therefore SYMROOT, needs to be set at the project level. 3157 # and therefore SYMROOT, needs to be set at the project level.
3141 'SYMROOT': '<(DEPTH)/xcodebuild', 3158 'SYMROOT': '<(DEPTH)/xcodebuild',
3142 }, 3159 },
3143 } 3160 }
OLDNEW
« android/envsetup.sh ('K') | « android/envsetup.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698