diff options
author | mathp <mathp@chromium.org> | 2015-10-21 13:53:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 20:54:55 +0000 |
commit | 43a8e38f6318192b107626d74e75c90d8d99f885 (patch) | |
tree | 09fe7f149029bfcab72be64b9a2a992047b53d8f /chrome/common_constants.gyp | |
parent | dd1274f99b889df2a344ddf64143a307d5a67d48 (diff) | |
download | chromium_src-43a8e38f6318192b107626d74e75c90d8d99f885.zip chromium_src-43a8e38f6318192b107626d74e75c90d8d99f885.tar.gz chromium_src-43a8e38f6318192b107626d74e75c90d8d99f885.tar.bz2 |
Revert of Cleanup chrome/version.h handling (patchset #9 id:160001 of https://codereview.chromium.org/1405633002/ )
Reason for revert:
Causing failures on the GN build (not gyp) for Mac:
http://build.chromium.org/p/chromium.mac/builders/Mac%20GN%20%28dbg%29/builds/23191
Original issue's description:
> Cleanup chrome/common/chrome_version.h handling
>
> Rename "version.h" to "chrome/common/chrome_version.h"
> Update #include and GYP/GN references
> Generate on all platforms
> Remove redundant generated chrome/common/chrome_version.cc.version
> Fix DEPS include_rules
>
> BUG=542807
>
> Committed: https://crrev.com/59647ecac9524d954010d3d10b539ee4a340bf94
> Cr-Commit-Position: refs/heads/master@{#355196}
>
> Committed: https://crrev.com/31f086c2013853749cac45522eb950b9d0ab0302
> Cr-Commit-Position: refs/heads/master@{#355377}
TBR=brettw@chromium.org,mdempsky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542807
Review URL: https://codereview.chromium.org/1418933002
Cr-Commit-Position: refs/heads/master@{#355393}
Diffstat (limited to 'chrome/common_constants.gyp')
-rw-r--r-- | chrome/common_constants.gyp | 84 |
1 files changed, 35 insertions, 49 deletions
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp index 134878e..4e79cdd 100644 --- a/chrome/common_constants.gyp +++ b/chrome/common_constants.gyp @@ -5,7 +5,14 @@ { 'variables': { 'chromium_code': 1, - 'common_constants_sources': [ + }, + + 'includes': [ + '../build/util/version.gypi', + ], + + 'target_defaults': { + 'sources': [ 'common/chrome_constants.cc', 'common/chrome_constants.h', 'common/chrome_icon_resources_win.cc', @@ -26,60 +33,43 @@ 'common/pref_names.cc', 'common/pref_names.h', ], + 'actions': [ + { + 'action_name': 'Make chrome_version.cc', + 'variables': { + 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', + 'template_input_path': 'common/chrome_version.cc.version', + }, + 'inputs': [ + '<(version_py_path)', + '<(version_path)', + '<(lastchange_path)', + '<(template_input_path)', + ], + 'outputs': [ + '<(INTERMEDIATE_DIR)/chrome_version.cc', + ], + 'action': [ + 'python', + '<(version_py_path)', + '-f', '<(version_path)', + '-f', '<(lastchange_path)', + '<(template_input_path)', + '<@(_outputs)', + ], + 'process_outputs_as_sources': 1, + }, + ], }, - - 'includes': [ - '../build/util/version.gypi', - ], - 'targets': [ { - # GN version: //chrome/common:version_header - 'target_name': 'version_header', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'version_header', - 'variables': { - 'lastchange_path': - '<(DEPTH)/build/util/LASTCHANGE', - 'branding_path': 'app/theme/<(branding_path_component)/BRANDING', - }, - 'inputs': [ - '<(version_path)', - '<(branding_path)', - '<(lastchange_path)', - 'common/chrome_version.h.in', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version.h', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-f', '<(version_path)', - '-f', '<(branding_path)', - '-f', '<(lastchange_path)', - 'common/chrome_version.h.in', - '<@(_outputs)', - ], - 'message': 'Generating version header file: <@(_outputs)', - }, - ], - }, - { # GN version: //chrome/common:constants 'target_name': 'common_constants', 'type': 'static_library', - 'sources': [ - '<@(common_constants_sources)' - ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. ], 'dependencies': [ - 'version_header', '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../components/components.gyp:bookmarks_common', @@ -109,14 +99,10 @@ { 'target_name': 'common_constants_win64', 'type': 'static_library', - 'sources': [ - '<@(common_constants_sources)' - ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. ], 'dependencies': [ - 'version_header', '../base/base.gyp:base_win64', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', '../components/nacl.gyp:nacl_switches_win64', |