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

Side by Side Diff: build/common.gypi

Issue 863253002: Update from https://crrev.com/312600 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
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 2040 matching lines...) Expand 10 before | Expand all | Expand 10 after
2051 'grit_defines': [ 2051 'grit_defines': [
2052 '-t', 'android', 2052 '-t', 'android',
2053 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true', 2053 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true',
2054 '--no-output-all-resource-defines', 2054 '--no-output-all-resource-defines',
2055 ], 2055 ],
2056 }], 2056 }],
2057 ['OS=="mac" or OS=="ios"', { 2057 ['OS=="mac" or OS=="ios"', {
2058 'grit_defines': ['-D', 'scale_factors=2x'], 2058 'grit_defines': ['-D', 'scale_factors=2x'],
2059 }], 2059 }],
2060 ['OS == "ios"', { 2060 ['OS == "ios"', {
2061 'variables': {
2062 'enable_coverage%': 0,
2063 },
2061 'grit_defines': [ 2064 'grit_defines': [
2062 '-t', 'ios', 2065 '-t', 'ios',
2063 # iOS uses a whitelist to filter resources. 2066 # iOS uses a whitelist to filter resources.
2064 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt', 2067 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt',
2065 '--no-output-all-resource-defines', 2068 '--no-output-all-resource-defines',
2066 ], 2069 ],
2067 2070
2068 # Enable host builds when generating with ninja-ios. 2071 # Enable host builds when generating with ninja-ios.
2069 'conditions': [ 2072 'conditions': [
2070 ['"<(GENERATOR)"=="ninja"', { 2073 ['"<(GENERATOR)"=="ninja"', {
2071 'host_os%': "mac", 2074 'host_os%': "mac",
2072 }], 2075 }],
2073 2076
2074 # TODO(sdefresne): Remove the target_subarch check once Apple has 2077 # TODO(sdefresne): Remove the target_subarch check once Apple has
2075 # upstreamed the support for "arm64". http://crbug.com/341453 2078 # upstreamed the support for "arm64". http://crbug.com/341453
2076 ['target_subarch!="arm32" or "<(GENERATOR)"=="xcode"', { 2079 # TODO(eugenebut): Remove enable_coverage check once
2080 # libclang_rt.profile_ios.a is bundled with Chromium's clang.
2081 # http://crbug.com/450379
2082 ['target_subarch!="arm32" or enable_coverage or "<(GENERATOR)"=="xcode "', {
2077 'clang_xcode%': 1, 2083 'clang_xcode%': 1,
2078 }], 2084 }],
2079 ], 2085 ],
2080 }], 2086 }],
2081 ['enable_extensions==1', { 2087 ['enable_extensions==1', {
2082 'grit_defines': ['-D', 'enable_extensions'], 2088 'grit_defines': ['-D', 'enable_extensions'],
2083 }], 2089 }],
2084 ['enable_plugins!=0', { 2090 ['enable_plugins!=0', {
2085 'grit_defines': ['-D', 'enable_plugins'], 2091 'grit_defines': ['-D', 'enable_plugins'],
2086 }], 2092 }],
(...skipping 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after
3524 }], 3530 }],
3525 # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 3531 # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
3526 ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0 and (chromeos==0 or target_arch!="arm")', { 3532 ['os_posix==1 and disable_fatal_linker_warnings==0 and use_evdev_gestures==0 and (chromeos==0 or target_arch!="arm")', {
3527 'target_defaults': { 3533 'target_defaults': {
3528 'ldflags': [ 3534 'ldflags': [
3529 '-Wl,--fatal-warnings', 3535 '-Wl,--fatal-warnings',
3530 ], 3536 ],
3531 }, 3537 },
3532 }], 3538 }],
3533 # TODO(thakis): Enable this everywhere. http://crbug.com/371125 3539 # TODO(thakis): Enable this everywhere. http://crbug.com/371125
3534 ['(OS=="linux" or OS=="android") and asan==0 and msan==0 and tsan==0 and use _ozone!=1', { 3540 ['(OS=="linux" or OS=="android") and asan==0 and msan==0 and tsan==0 and ubs an==0 and ubsan_vptr==0 and use_ozone!=1', {
3535 'target_defaults': { 3541 'target_defaults': {
3536 'ldflags': [ 3542 'ldflags': [
3537 '-Wl,-z,defs', 3543 '-Wl,-z,defs',
3538 ], 3544 ],
3539 }, 3545 },
3540 }], 3546 }],
3541 ['os_posix==1 and chromeos==0', { 3547 ['os_posix==1 and chromeos==0', {
3542 # Chrome OS enables -fstack-protector-strong via its build wrapper, 3548 # Chrome OS enables -fstack-protector-strong via its build wrapper,
3543 # and we want to avoid overriding this, so stack-protector is only 3549 # and we want to avoid overriding this, so stack-protector is only
3544 # enabled when not building on Chrome OS. 3550 # enabled when not building on Chrome OS.
(...skipping 2306 matching lines...) Expand 10 before | Expand all | Expand 10 after
5851 # settings in target dicts. SYMROOT is a special case, because many other 5857 # settings in target dicts. SYMROOT is a special case, because many other
5852 # Xcode variables depend on it, including variables such as 5858 # Xcode variables depend on it, including variables such as
5853 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5859 # 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 5860 # 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 5861 # 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, 5862 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5857 # and therefore SYMROOT, needs to be set at the project level. 5863 # and therefore SYMROOT, needs to be set at the project level.
5858 'SYMROOT': '<(DEPTH)/xcodebuild', 5864 'SYMROOT': '<(DEPTH)/xcodebuild',
5859 }, 5865 },
5860 } 5866 }
OLDNEW
« no previous file with comments | « build/android/test_runner.py ('k') | build/config/compiler/BUILD.gn » ('j') | testing/test.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698