diff options
| author | tobiasjs <tobiasjs@chromium.org> | 2015-04-01 08:40:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-01 15:41:24 +0000 |
| commit | 81886c2785d02db150318bd7496e7493cd92db72 (patch) | |
| tree | 524c19f24dbea4128e69e1780c52e0c4b80a8898 /build | |
| parent | 21ab5bd5415bde7364be6edceeb5f43e310009cb (diff) | |
| download | chromium_src-81886c2785d02db150318bd7496e7493cd92db72.zip chromium_src-81886c2785d02db150318bd7496e7493cd92db72.tar.gz chromium_src-81886c2785d02db150318bd7496e7493cd92db72.tar.bz2 | |
Move android_app_version_* into an inner variables dict.
This is required to allow webview to provide a separately
overrideable version code.
BUG=
Review URL: https://codereview.chromium.org/1054543002
Cr-Commit-Position: refs/heads/master@{#323242}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index 918dcc5..b0dbfb8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1081,6 +1081,11 @@ 'google_default_client_secret%': '', # Native Client is enabled by default. 'disable_nacl%': '0', + + # Sets the default version name and code for Android app, by default we + # do a developer build. + 'android_app_version_name%': 'Developer Build', + 'android_app_version_code%': 1, }, # Copy conditionally-set variables out one scope. @@ -1236,6 +1241,8 @@ 'cfi_unrelated_cast%': '<(cfi_unrelated_cast)', 'cfi_blacklist%': '<(cfi_blacklist)', 'mac_views_browser%': '<(mac_views_browser)', + 'android_app_version_name%': '<(android_app_version_name)', + 'android_app_version_code%': '<(android_app_version_code)', # Use system protobuf instead of bundled one. 'use_system_protobuf%': 0, @@ -1467,11 +1474,6 @@ # we can build a debug version with acceptable size and performance. 'android_full_debug%': 0, - # Sets the default version name and code for Android app, by default we - # do a developer build. - 'android_app_version_name%': 'Developer Build', - 'android_app_version_code%': 1, - # Contains data about the attached devices for gyp_managed_install. 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg', |