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

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: Response to comments + fixes gyp build error. 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 'allocator/allocator.gyp:allocator', 24 'allocator/allocator.gyp:allocator',
25 'base_debugging_flags#target', 25 'base_debugging_flags#target',
26 'base_static', 26 'base_static',
27 'base_build_date#target',
27 '../testing/gtest.gyp:gtest_prod', 28 '../testing/gtest.gyp:gtest_prod',
28 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 29 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
29 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 30 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
30 ], 31 ],
31 # TODO(gregoryd): direct_dependent_settings should be shared with the 32 # TODO(gregoryd): direct_dependent_settings should be shared with the
32 # 64-bit target, but it doesn't work due to a bug in gyp 33 # 64-bit target, but it doesn't work due to a bug in gyp
33 'direct_dependent_settings': { 34 'direct_dependent_settings': {
34 'include_dirs': [ 35 'include_dirs': [
35 '..', 36 '..',
36 ], 37 ],
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 # toolchain, always refer to 'base_debugging_flags#target'. 986 # toolchain, always refer to 'base_debugging_flags#target'.
986 'target_name': 'base_debugging_flags', 987 'target_name': 'base_debugging_flags',
987 'includes': [ '../build/buildflag_header.gypi' ], 988 'includes': [ '../build/buildflag_header.gypi' ],
988 'variables': { 989 'variables': {
989 'buildflag_header_path': 'base/debug/debugging_flags.h', 990 'buildflag_header_path': 'base/debug/debugging_flags.h',
990 'buildflag_flags': [ 991 'buildflag_flags': [
991 'ENABLE_PROFILING=<(profiling)', 992 'ENABLE_PROFILING=<(profiling)',
992 ], 993 ],
993 }, 994 },
994 }, 995 },
996 {
997 'type': 'none',
998 'target_name': 'base_build_date',
Nico 2016/02/09 22:53:49 This also needs a 'hard_dependency': 1, li
Zachary Forman 2016/02/09 23:26:23 Thanks for the save :)
999 'actions': [{
1000 'action_name': 'generate_build_date_headers',
1001 'inputs': [
1002 '<(DEPTH)/build/write_build_date_header.py',
1003 '<(DEPTH)/build/util/LASTCHANGE'
1004 ],
1005 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/base/generated_build_date.h' ],
1006 'action': [
1007 'python', '<(DEPTH)/build/write_build_date_header.py',
1008 '<(SHARED_INTERMEDIATE_DIR)/base/generated_build_date.h',
1009 '<(build_type)'
1010 ]
1011 }],
1012 'conditions': [
1013 [ 'buildtype == "Official"', {
1014 'variables': {
1015 'build_type': 'official'
1016 }
1017 }, {
1018 'variables': {
1019 'build_type': 'default'
1020 }
1021 }],
1022 ]
1023 },
995 ], 1024 ],
996 'conditions': [ 1025 'conditions': [
997 ['OS=="ios" and "<(GENERATOR)"=="ninja"', { 1026 ['OS=="ios" and "<(GENERATOR)"=="ninja"', {
998 'targets': [ 1027 'targets': [
999 { 1028 {
1000 'target_name': 'test_launcher', 1029 'target_name': 'test_launcher',
1001 'toolsets': ['host'], 1030 'toolsets': ['host'],
1002 'type': 'executable', 1031 'type': 'executable',
1003 'dependencies': [ 1032 'dependencies': [
1004 'test_support_base', 1033 'test_support_base',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 'targets': [ 1069 'targets': [
1041 # The base_win64 target here allows us to use base for Win64 targets 1070 # The base_win64 target here allows us to use base for Win64 targets
1042 # (the normal build is 32 bits). 1071 # (the normal build is 32 bits).
1043 { 1072 {
1044 'target_name': 'base_win64', 1073 'target_name': 'base_win64',
1045 'type': '<(component)', 1074 'type': '<(component)',
1046 'variables': { 1075 'variables': {
1047 'base_target': 1, 1076 'base_target': 1,
1048 }, 1077 },
1049 'dependencies': [ 1078 'dependencies': [
1079 'base_build_date',
1050 'base_debugging_flags#target', 1080 'base_debugging_flags#target',
1051 'base_static_win64', 1081 'base_static_win64',
1052 '../third_party/modp_b64/modp_b64.gyp:modp_b64_win64', 1082 '../third_party/modp_b64/modp_b64.gyp:modp_b64_win64',
1053 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations_win64', 1083 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations_win64',
1054 'trace_event/etw_manifest/etw_manifest.gyp:etw_manifest', 1084 'trace_event/etw_manifest/etw_manifest.gyp:etw_manifest',
1055 ], 1085 ],
1056 # TODO(gregoryd): direct_dependent_settings should be shared with the 1086 # TODO(gregoryd): direct_dependent_settings should be shared with the
1057 # 32-bit target, but it doesn't work due to a bug in gyp 1087 # 32-bit target, but it doesn't work due to a bug in gyp
1058 'direct_dependent_settings': { 1088 'direct_dependent_settings': {
1059 'include_dirs': [ 1089 'include_dirs': [
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 '../build/isolate.gypi', 1668 '../build/isolate.gypi',
1639 ], 1669 ],
1640 'sources': [ 1670 'sources': [
1641 'base_unittests.isolate', 1671 'base_unittests.isolate',
1642 ], 1672 ],
1643 }, 1673 },
1644 ], 1674 ],
1645 }], 1675 }],
1646 ], 1676 ],
1647 } 1677 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698