Skip to content

Commit

Permalink
Remove obsolete override "ios_extra_version_path".
Browse files Browse the repository at this point in the history
Chrome on iOS is aligning with the rest of Chrome and no longer uses
"ios_extra_version_path". Remove it from version_info components and
remove the "gclient" hook that generated ios/build/util/CANARY_VERSION.

BUG=591419

Review URL: https://codereview.chromium.org/1784783002

Cr-Commit-Position: refs/heads/master@{#380394}
  • Loading branch information
sdefresne authored and Commit bot committed Mar 10, 2016
1 parent 9637a42 commit 39e8a6f
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 121 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ vs-chromium-project.txt
/gyp-mac-tool
/infra/.recipe_deps
/internal_gyp
/ios/build/util/CANARY_VERSION
/ios/third_party/earl_grey/src
/ios/third_party/fishhook/src
/ios/third_party/gcdwebserver/src
Expand Down
7 changes: 0 additions & 7 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -650,13 +650,6 @@ hooks = [
'-s', 'src/third_party/WebKit',
'-o', 'src/build/util/LASTCHANGE.blink'],
},
{
# Update CANARY_VERSION.
'name': 'ios_canary_version',
'pattern': '.',
'action': ['python', 'src/ios/build/util/canary_version.py',
'-o', 'src/ios/build/util/CANARY_VERSION'],
},
# Pull GN binaries. This needs to be before running GYP below.
{
'name': 'gn_win',
Expand Down
33 changes: 0 additions & 33 deletions components/version_info.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

{
'variables': {
# Some plaform want to override part of the version number generation
# (for example iOS uses a different value for PATCH level for canary).
# This can be done settings "extra_version_path" variable to the path
# of a file with the corresponding value overrides. If present it will
# be loaded after all other input files.
'extra_version_name': '',
'conditions': [
['branding == "Chrome"', {
'use_unofficial_version_number%': 0,
Expand Down Expand Up @@ -93,35 +87,8 @@
'<(template_input_path)',
'<@(_outputs)',
],
'conditions': [
['extra_version_name!=""', {
'variables': {
'extra_version_flags': [
'-f', '<(extra_version_name)',
],
},
'inputs': [
'<(extra_version_name)'
],
}],
],
},
],
},
],
'conditions': [
['OS=="ios"', {
'variables': {
# Use nested 'variables' to workaround how variables work with gyp (no
# determined ordering and thuse it is not possible to define a variable
# in function of another).
'variables': {
# Path to the file used to override the version PATH level on iOS.
# Default to ios/build/util/VERSION.
'ios_extra_version_path%': '../ios/build/util/VERSION',
},
'extra_version_name': '<(ios_extra_version_path)'
},
}],
],
}
21 changes: 0 additions & 21 deletions components/version_info/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ import("//build/config/chrome_build.gni")
import("//chrome/version.gni")

declare_args() {
if (is_ios) {
# Path to the file used to override the version PATH level on iOS.
# Default to ios/build/util/VERSION.
ios_extra_version_path = "//ios/build/util/VERSION"
}

use_unofficial_version_number = !is_chrome_branded
}

Expand All @@ -36,19 +30,4 @@ source_set("version_info") {
process_version("generate_version_info") {
template_file = "version_info_values.h.version"
output = "$target_gen_dir/version_info_values.h"

if (is_ios) {
# iOS overrides PATCH level of the version with the value from the file
# named by ios_version_path, however, this needs to be the last argument
# to the version.py script, so it cannot be added to the sources variable
# and instead need to be managed manually.

inputs = [
ios_extra_version_path,
]
extra_args = [
"-f",
rebase_path(ios_extra_version_path, root_build_dir),
]
}
}
1 change: 0 additions & 1 deletion ios/build/util/VERSION

This file was deleted.

58 changes: 0 additions & 58 deletions ios/build/util/canary_version.py

This file was deleted.

0 comments on commit 39e8a6f

Please sign in to comment.