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

Side by Side Diff: build/common.gypi

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 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
« no previous file with comments | « no previous file | cc/cc.gyp » ('j') | 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 # This is set when building the Android WebView inside the Android 110 # This is set when building the Android WebView inside the Android
111 # build system, using the 'android' gyp backend. The WebView code is 111 # build system, using the 'android' gyp backend. The WebView code is
112 # still built when this is unset, but builds using the normal chromium 112 # still built when this is unset, but builds using the normal chromium
113 # build system. 113 # build system.
114 'android_webview_build%': 0, 114 'android_webview_build%': 0,
115 115
116 # Sets whether chrome is built for google tv device. 116 # Sets whether chrome is built for google tv device.
117 'google_tv%': 0, 117 'google_tv%': 0,
118 118
119 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they
120 # are built under a chromium full build (1) or a webkit.org chromium
121 # build (0).
122 'inside_chromium_build%': 1,
123
124 # Set ARM architecture version. 119 # Set ARM architecture version.
125 'arm_version%': 7, 120 'arm_version%': 7,
126 121
127 'conditions': [ 122 'conditions': [
128 # Set default value of toolkit_views based on OS. 123 # Set default value of toolkit_views based on OS.
129 ['OS=="win" or chromeos==1 or use_aura==1', { 124 ['OS=="win" or chromeos==1 or use_aura==1', {
130 'toolkit_views%': 1, 125 'toolkit_views%': 1,
131 }, { 126 }, {
132 'toolkit_views%': 0, 127 'toolkit_views%': 0,
133 }], 128 }],
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 174 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
180 'use_aura%': '<(use_aura)', 175 'use_aura%': '<(use_aura)',
181 'use_ash%': '<(use_ash)', 176 'use_ash%': '<(use_ash)',
182 'use_ozone%': '<(use_ozone)', 177 'use_ozone%': '<(use_ozone)',
183 'use_openssl%': '<(use_openssl)', 178 'use_openssl%': '<(use_openssl)',
184 'enable_viewport%': '<(enable_viewport)', 179 'enable_viewport%': '<(enable_viewport)',
185 'enable_hidpi%': '<(enable_hidpi)', 180 'enable_hidpi%': '<(enable_hidpi)',
186 'enable_touch_ui%': '<(enable_touch_ui)', 181 'enable_touch_ui%': '<(enable_touch_ui)',
187 'android_webview_build%': '<(android_webview_build)', 182 'android_webview_build%': '<(android_webview_build)',
188 'google_tv%': '<(google_tv)', 183 'google_tv%': '<(google_tv)',
189 'inside_chromium_build%': '<(inside_chromium_build)',
190 'enable_app_list%': '<(enable_app_list)', 184 'enable_app_list%': '<(enable_app_list)',
191 'enable_message_center%': '<(enable_message_center)', 185 'enable_message_center%': '<(enable_message_center)',
192 'use_default_render_theme%': '<(use_default_render_theme)', 186 'use_default_render_theme%': '<(use_default_render_theme)',
193 'buildtype%': '<(buildtype)', 187 'buildtype%': '<(buildtype)',
194 'arm_version%': '<(arm_version)', 188 'arm_version%': '<(arm_version)',
195 189
196 # Override branding to select the desired branding flavor. 190 # Override branding to select the desired branding flavor.
197 'branding%': 'Chromium', 191 'branding%': 'Chromium',
198 192
199 # Set to 1 to enable fast builds. Set to 2 for even faster builds 193 # Set to 1 to enable fast builds. Set to 2 for even faster builds
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 # target always calls tools/swarm_client/isolate.py. See the script's 634 # target always calls tools/swarm_client/isolate.py. See the script's
641 # --help for more information and the valid --mode values. Meant to be 635 # --help for more information and the valid --mode values. Meant to be
642 # overriden with GYP_DEFINES. 636 # overriden with GYP_DEFINES.
643 # TODO(maruel): Remove the conditions as more configurations are 637 # TODO(maruel): Remove the conditions as more configurations are
644 # supported. 638 # supported.
645 # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code 639 # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code
646 # again. 640 # again.
647 # NOTE: The check for disable_nacl==0 and component=="static_library" 641 # NOTE: The check for disable_nacl==0 and component=="static_library"
648 # can't be used here because these variables are not defined yet, but it 642 # can't be used here because these variables are not defined yet, but it
649 # is still not supported. 643 # is still not supported.
650 ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', { 644 ['OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', {
651 'test_isolation_mode%': 'check', 645 'test_isolation_mode%': 'check',
652 }, { 646 }, {
653 'test_isolation_mode%': 'noop', 647 'test_isolation_mode%': 'noop',
654 }], 648 }],
655 # Whether Android ARM build uses OpenMAX DL FFT. 649 # Whether Android ARM build uses OpenMAX DL FFT.
656 ['OS=="android" and target_arch=="arm" and android_webview_build==0', { 650 ['OS=="android" and target_arch=="arm" and android_webview_build==0', {
657 # Currently only supported on Android ARM, without webview. 651 # Currently only supported on Android ARM, without webview.
658 # When enabled, this will also enable WebAudio on Android 652 # When enabled, this will also enable WebAudio on Android
659 # ARM. Default is enabled. 653 # ARM. Default is enabled.
660 'use_openmax_dl_fft%': 1, 654 'use_openmax_dl_fft%': 1,
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 'use_x11%': '<(use_x11)', 715 'use_x11%': '<(use_x11)',
722 'use_gnome_keyring%': '<(use_gnome_keyring)', 716 'use_gnome_keyring%': '<(use_gnome_keyring)',
723 'linux_fpic%': '<(linux_fpic)', 717 'linux_fpic%': '<(linux_fpic)',
724 'chromeos%': '<(chromeos)', 718 'chromeos%': '<(chromeos)',
725 'enable_viewport%': '<(enable_viewport)', 719 'enable_viewport%': '<(enable_viewport)',
726 'enable_hidpi%': '<(enable_hidpi)', 720 'enable_hidpi%': '<(enable_hidpi)',
727 'enable_touch_ui%': '<(enable_touch_ui)', 721 'enable_touch_ui%': '<(enable_touch_ui)',
728 'use_xi2_mt%':'<(use_xi2_mt)', 722 'use_xi2_mt%':'<(use_xi2_mt)',
729 'file_manager_extension%': '<(file_manager_extension)', 723 'file_manager_extension%': '<(file_manager_extension)',
730 'image_loader_extension%': '<(image_loader_extension)', 724 'image_loader_extension%': '<(image_loader_extension)',
731 'inside_chromium_build%': '<(inside_chromium_build)',
732 'fastbuild%': '<(fastbuild)', 725 'fastbuild%': '<(fastbuild)',
733 'dcheck_always_on%': '<(dcheck_always_on)', 726 'dcheck_always_on%': '<(dcheck_always_on)',
734 'python_ver%': '<(python_ver)', 727 'python_ver%': '<(python_ver)',
735 'arm_version%': '<(arm_version)', 728 'arm_version%': '<(arm_version)',
736 'armv7%': '<(armv7)', 729 'armv7%': '<(armv7)',
737 'arm_neon%': '<(arm_neon)', 730 'arm_neon%': '<(arm_neon)',
738 'arm_neon_optional%': '<(arm_neon_optional)', 731 'arm_neon_optional%': '<(arm_neon_optional)',
739 'sysroot%': '<(sysroot)', 732 'sysroot%': '<(sysroot)',
740 'system_libdir%': '<(system_libdir)', 733 'system_libdir%': '<(system_libdir)',
741 'component%': '<(component)', 734 'component%': '<(component)',
(...skipping 2521 matching lines...) Expand 10 before | Expand all | Expand 10 after
3263 # now. 3256 # now.
3264 #'-Wl,--icf=safe', 3257 #'-Wl,--icf=safe',
3265 '-Wl,--icf=none', 3258 '-Wl,--icf=none',
3266 ], 3259 ],
3267 }], 3260 }],
3268 ], 3261 ],
3269 }], 3262 }],
3270 ], 3263 ],
3271 }], 3264 }],
3272 ['linux_use_gold_binary==1', { 3265 ['linux_use_gold_binary==1', {
3273 'variables': {
3274 'conditions': [
3275 ['inside_chromium_build==1', {
3276 # We pass the path to gold to the compiler. gyp leaves
3277 # unspecified what the cwd is when running the compiler,
3278 # so the normal gyp path-munging fails us. This hack
3279 # gets the right path.
3280 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold',
3281 }, {
3282 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/thir d_party/gold',
3283 }]
3284 ]
3285 },
3286 'ldflags': [ 3266 'ldflags': [
3287 # Put our gold binary in the search path for the linker. 3267 # Put our gold binary in the search path for the linker.
3288 '-B<(gold_path)', 3268 # We pass the path to gold to the compiler. gyp leaves
3269 # unspecified what the cwd is when running the compiler,
3270 # so the normal gyp path-munging fails us. This hack
3271 # gets the right path.
3272 '-B<(PRODUCT_DIR)/../../third_party/gold',
3289 ], 3273 ],
3290 }], 3274 }],
3291 ], 3275 ],
3292 }, 3276 },
3293 }], 3277 }],
3294 # FreeBSD-specific options; note that most FreeBSD options are set above, 3278 # FreeBSD-specific options; note that most FreeBSD options are set above,
3295 # with Linux. 3279 # with Linux.
3296 ['OS=="freebsd"', { 3280 ['OS=="freebsd"', {
3297 'target_defaults': { 3281 'target_defaults': {
3298 'ldflags': [ 3282 'ldflags': [
(...skipping 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after
4439 # settings in target dicts. SYMROOT is a special case, because many other 4423 # settings in target dicts. SYMROOT is a special case, because many other
4440 # Xcode variables depend on it, including variables such as 4424 # Xcode variables depend on it, including variables such as
4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4425 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4426 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4443 # files to appear (when present) in the UI as actual files and not red 4427 # files to appear (when present) in the UI as actual files and not red
4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4428 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4445 # and therefore SYMROOT, needs to be set at the project level. 4429 # and therefore SYMROOT, needs to be set at the project level.
4446 'SYMROOT': '<(DEPTH)/xcodebuild', 4430 'SYMROOT': '<(DEPTH)/xcodebuild',
4447 }, 4431 },
4448 } 4432 }
OLDNEW
« no previous file with comments | « no previous file | cc/cc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698