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

Side by Side Diff: build/common.gypi

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
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 23 matching lines...) Expand all
34 'use_cras%': 0, 34 'use_cras%': 0,
35 35
36 # Use a raw surface abstraction. 36 # Use a raw surface abstraction.
37 'use_ozone%': 0, 37 'use_ozone%': 0,
38 38
39 # Configure the build for small devices. See crbug.com/318413 39 # Configure the build for small devices. See crbug.com/318413
40 'embedded%': 0, 40 'embedded%': 0,
41 41
42 'conditions': [ 42 'conditions': [
43 # Compute the architecture that we're building on. 43 # Compute the architecture that we're building on.
44 ['OS=="win" or OS=="mac" or OS=="ios"', { 44 ['OS=="win" or OS=="ios"', {
45 'host_arch%': 'ia32', 45 'host_arch%': 'ia32',
46 }, { 46 }, {
47 'host_arch%': '<!pymod_do_main(detect_host_arch)', 47 'host_arch%': '<!pymod_do_main(detect_host_arch)',
48 }], 48 }],
49 ], 49 ],
50 }, 50 },
51 # Copy conditionally-set variables out one scope. 51 # Copy conditionally-set variables out one scope.
52 'chromeos%': '<(chromeos)', 52 'chromeos%': '<(chromeos)',
53 'chromecast%': '<(chromecast)', 53 'chromecast%': '<(chromecast)',
54 'use_aura%': '<(use_aura)', 54 'use_aura%': '<(use_aura)',
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 990
991 # Turn on JNI generation optimizations on non-WebView builds. 991 # Turn on JNI generation optimizations on non-WebView builds.
992 ['OS=="android" and android_webview_build==0', { 992 ['OS=="android" and android_webview_build==0', {
993 'optimize_jni_generation%': 1, 993 'optimize_jni_generation%': 1,
994 }, { 994 }, {
995 'optimize_jni_generation%': 0, 995 'optimize_jni_generation%': 0,
996 }], 996 }],
997 997
998 # TODO(baixo): Enable v8_use_external_startup_data 998 # TODO(baixo): Enable v8_use_external_startup_data
999 # http://crbug.com/421063 999 # http://crbug.com/421063
1000 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0', { 1000 ['android_webview_build==0 and android_webview_telemetry_build==0 and ch romecast==0 and OS=="android"', {
1001 'v8_use_external_startup_data': 0, 1001 'v8_use_external_startup_data': 1,
1002 }, { 1002 }, {
1003 'v8_use_external_startup_data': 0, 1003 'v8_use_external_startup_data': 0,
1004 }], 1004 }],
1005 ], 1005 ],
1006 1006
1007 # Set this to 1 to enable use of concatenated impulse responses 1007 # Set this to 1 to enable use of concatenated impulse responses
1008 # for the HRTF panner in WebAudio. 1008 # for the HRTF panner in WebAudio.
1009 'use_concatenated_impulse_responses': 1, 1009 'use_concatenated_impulse_responses': 1,
1010 1010
1011 # You can set the variable 'use_official_google_api_keys' to 1 1011 # You can set the variable 'use_official_google_api_keys' to 1
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
2268 'arm_fpu%': 'neon', 2268 'arm_fpu%': 'neon',
2269 }, { 2269 }, {
2270 'arm_fpu%': 'vfpv3-d16', 2270 'arm_fpu%': 'vfpv3-d16',
2271 }], 2271 }],
2272 ], 2272 ],
2273 # Change the default to hard once the armhf transition is complete. 2273 # Change the default to hard once the armhf transition is complete.
2274 'arm_float_abi%': 'softfp', 2274 'arm_float_abi%': 'softfp',
2275 'arm_thumb%': 1, 2275 'arm_thumb%': 1,
2276 }], 2276 }],
2277 2277
2278 # Set default compiler flags depending on MIPS architecture variant.
2279 ['target_arch=="mipsel" and mips_arch_variant=="r2" and android_webview_bu ild==0', {
2280 'mips_fpu_mode%': 'fp32',
2281 }],
2282
2278 ['android_webview_build==1', { 2283 ['android_webview_build==1', {
2279 # The WebView build gets its cpu-specific flags from the Android build s ystem. 2284 # The WebView build gets its cpu-specific flags from the Android build s ystem.
2280 'arm_arch%': '', 2285 'arm_arch%': '',
2281 'arm_tune%': '', 2286 'arm_tune%': '',
2282 'arm_fpu%': '', 2287 'arm_fpu%': '',
2283 'arm_float_abi%': '', 2288 'arm_float_abi%': '',
2284 'arm_thumb%': 0, 2289 'arm_thumb%': 0,
2290 'mips_fpu_mode%': '',
2285 }], 2291 }],
2286 2292
2287 # Enable brlapi by default for chromeos. 2293 # Enable brlapi by default for chromeos.
2288 [ 'chromeos==1', { 2294 [ 'chromeos==1', {
2289 'use_brlapi%': 1, 2295 'use_brlapi%': 1,
2290 }], 2296 }],
2291 2297
2292 ['use_ozone==1 and ozone_auto_platforms==1', { 2298 ['use_ozone==1 and ozone_auto_platforms==1', {
2293 # Use test as the default platform. 2299 # Use test as the default platform.
2294 'ozone_platform%': 'test', 2300 'ozone_platform%': 'test',
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
3157 'ole32.lib', 3163 'ole32.lib',
3158 'oleaut32.lib', 3164 'oleaut32.lib',
3159 'user32.lib', 3165 'user32.lib',
3160 'uuid.lib', 3166 'uuid.lib',
3161 'odbc32.lib', 3167 'odbc32.lib',
3162 'odbccp32.lib', 3168 'odbccp32.lib',
3163 'delayimp.lib', 3169 'delayimp.lib',
3164 'credui.lib', 3170 'credui.lib',
3165 'netapi32.lib', 3171 'netapi32.lib',
3166 ], 3172 ],
3173 'AdditionalOptions': [
3174 # Suggested by Microsoft Devrel to avoid
3175 # LINK : fatal error LNK1248: image size (80000000) exceeds maxi mum allowable size (80000000)
3176 # which started happening more regularly after VS2013 Update 4.
3177 '/maxilksize:2147483647',
3178 ],
3167 }, 3179 },
3168 }, 3180 },
3169 }, 3181 },
3170 'x86_Base': { 3182 'x86_Base': {
3171 'abstract': 1, 3183 'abstract': 1,
3172 'msvs_settings': { 3184 'msvs_settings': {
3173 'VCLinkerTool': { 3185 'VCLinkerTool': {
3174 'MinimumRequiredVersion': '5.01', # XP. 3186 'MinimumRequiredVersion': '5.01', # XP.
3175 'TargetMachine': '1', 3187 'TargetMachine': '1',
3176 }, 3188 },
(...skipping 2221 matching lines...) Expand 10 before | Expand all | Expand 10 after
5398 # Chromium code compiles without exception support. We therefore have 5410 # Chromium code compiles without exception support. We therefore have
5399 # to use setjmp/longjmp for e.g. JPEG decode error handling, which 5411 # to use setjmp/longjmp for e.g. JPEG decode error handling, which
5400 # means we have to turn off this warning (and be careful about how 5412 # means we have to turn off this warning (and be careful about how
5401 # object destruction happens in such cases). 5413 # object destruction happens in such cases).
5402 4611, 5414 4611,
5403 5415
5404 # TODO(maruel): These warnings are level 4. They will be slowly 5416 # TODO(maruel): These warnings are level 4. They will be slowly
5405 # removed as code is fixed. 5417 # removed as code is fixed.
5406 4100, # Unreferenced formal parameter 5418 4100, # Unreferenced formal parameter
5407 4121, # Alignment of a member was sensitive to packing 5419 4121, # Alignment of a member was sensitive to packing
5408 4189, # Local variable is initialized but not referenced
5409 4244, # Conversion from 'type1' to 'type2', possible loss of data 5420 4244, # Conversion from 'type1' to 'type2', possible loss of data
5410 4481, # Nonstandard extension used: override specifier 'keyword' 5421 4481, # Nonstandard extension used: override specifier 'keyword'
5411 4505, # Unreferenced local function has been removed 5422 4505, # Unreferenced local function has been removed
5412 4510, # Default constructor could not be generated 5423 4510, # Default constructor could not be generated
5413 4512, # Assignment operator could not be generated 5424 4512, # Assignment operator could not be generated
5414 4610, # Object can never be instantiated 5425 4610, # Object can never be instantiated
5415 4996, # 'X': was declared deprecated (for GetVersionEx). 5426 4996, # 'X': was declared deprecated (for GetVersionEx).
5416 ], 5427 ],
5417 'msvs_settings': { 5428 'msvs_settings': {
5418 'VCCLCompilerTool': { 5429 'VCCLCompilerTool': {
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
5851 # settings in target dicts. SYMROOT is a special case, because many other 5862 # settings in target dicts. SYMROOT is a special case, because many other
5852 # Xcode variables depend on it, including variables such as 5863 # Xcode variables depend on it, including variables such as
5853 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5864 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5854 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5865 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5855 # files to appear (when present) in the UI as actual files and not red 5866 # files to appear (when present) in the UI as actual files and not red
5856 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5867 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5857 # and therefore SYMROOT, needs to be set at the project level. 5868 # and therefore SYMROOT, needs to be set at the project level.
5858 'SYMROOT': '<(DEPTH)/xcodebuild', 5869 'SYMROOT': '<(DEPTH)/xcodebuild',
5859 }, 5870 },
5860 } 5871 }
OLDNEW
« no previous file with comments | « build/android/tests/multiple_proguards/src/dummy/DummyActivity.java ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698