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

Side by Side Diff: base/base.gyp

Issue 1641413002: Makes GetBuildTime behave identically on all build types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed bad input Created 4 years, 10 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
11 'base.gypi', 11 'base.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'base', 15 'target_name': 'base',
16 'type': '<(component)', 16 'type': '<(component)',
17 'toolsets': ['host', 'target'], 17 'toolsets': ['host', 'target'],
18 'variables': { 18 'variables': {
19 'base_target': 1, 19 'base_target': 1,
20 'enable_wexit_time_destructors': 1, 20 'enable_wexit_time_destructors': 1,
21 'optimize': 'max', 21 'optimize': 'max',
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 'base_debugging_flags#target', 24 'base_debugging_flags#target',
25 'base_static', 25 'base_static',
26 'base_build_date#target',
26 '../testing/gtest.gyp:gtest_prod', 27 '../testing/gtest.gyp:gtest_prod',
27 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 28 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
28 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 29 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
29 ], 30 ],
30 # TODO(gregoryd): direct_dependent_settings should be shared with the 31 # TODO(gregoryd): direct_dependent_settings should be shared with the
31 # 64-bit target, but it doesn't work due to a bug in gyp 32 # 64-bit target, but it doesn't work due to a bug in gyp
32 'direct_dependent_settings': { 33 'direct_dependent_settings': {
33 'include_dirs': [ 34 'include_dirs': [
34 '..', 35 '..',
35 ], 36 ],
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 # toolchain, always refer to 'base_debugging_flags#target'. 1090 # toolchain, always refer to 'base_debugging_flags#target'.
1090 'target_name': 'base_debugging_flags', 1091 'target_name': 'base_debugging_flags',
1091 'includes': [ '../build/buildflag_header.gypi' ], 1092 'includes': [ '../build/buildflag_header.gypi' ],
1092 'variables': { 1093 'variables': {
1093 'buildflag_header_path': 'base/debug/debugging_flags.h', 1094 'buildflag_header_path': 'base/debug/debugging_flags.h',
1094 'buildflag_flags': [ 1095 'buildflag_flags': [
1095 'ENABLE_PROFILING=<(profiling)', 1096 'ENABLE_PROFILING=<(profiling)',
1096 ], 1097 ],
1097 }, 1098 },
1098 }, 1099 },
1100 {
1101 'type': 'none',
1102 'target_name': 'base_build_date',
1103 'actions': [{
1104 'action_name': 'generate_build_date_headers',
1105 'inputs': [ '<(DEPTH)/build/write_build_date_header.py' ],
1106 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/base/generated_build_date.h' ],
1107 'action': [
1108 'python', '<(DEPTH)/build/write_build_date_header.py',
1109 '<(SHARED_INTERMEDIATE_DIR)/base/generated_build_date.h', '--<(build_t ype)'
1110 ]
1111 }],
1112 'conditions': [
1113 [ 'buildtype == "Official"', {
1114 'variables': {
1115 'build_type': '--official'
1116 }
1117 }, {
1118 'variables': {
1119 'build_type': '--official'
M-A Ruel 2016/02/01 17:52:28 --default ?
Zachary Forman 2016/02/02 06:30:38 Oops - good catch!
1120 }
1121 }],
1122 ]
1123 },
1099 ], 1124 ],
1100 'conditions': [ 1125 'conditions': [
1101 ['OS=="ios" and "<(GENERATOR)"=="ninja"', { 1126 ['OS=="ios" and "<(GENERATOR)"=="ninja"', {
1102 'targets': [ 1127 'targets': [
1103 { 1128 {
1104 'target_name': 'test_launcher', 1129 'target_name': 'test_launcher',
1105 'toolsets': ['host'], 1130 'toolsets': ['host'],
1106 'type': 'executable', 1131 'type': 'executable',
1107 'dependencies': [ 1132 'dependencies': [
1108 'test_support_base', 1133 'test_support_base',
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1736 '../build/isolate.gypi', 1761 '../build/isolate.gypi',
1737 ], 1762 ],
1738 'sources': [ 1763 'sources': [
1739 'base_unittests.isolate', 1764 'base_unittests.isolate',
1740 ], 1765 ],
1741 }, 1766 },
1742 ], 1767 ],
1743 }], 1768 }],
1744 ], 1769 ],
1745 } 1770 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698