Skip to content

Commit

Permalink
Don't use SVN revision for Chromoting Android APK internal version.
Browse files Browse the repository at this point in the history
An APK built from a later Chromium branch should have a higher version
number than one built from an earlier branch. This CL fixes the
Chromoting Android package's internal version to have that property.

The scheme implemented here matches official Chrome.apk.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244659 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
lambroslambrou@chromium.org committed Jan 14, 2014
1 parent 3777e77 commit 91029e6
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion remoting/remoting_android.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
'variables': {
'apk_name': 'Chromoting',
'android_app_version_name': '<(version_full)',
'android_app_version_code': '<!(python ../build/util/lastchange.py --revision-only)',
'android_app_version_code': '<!(python tools/android_version.py <(android_app_version_name))',
'manifest_package_name': 'org.chromium.chromoting',
'native_lib_target': 'libremoting_client_jni',
'java_in_dir': 'android/java',
Expand Down
28 changes: 28 additions & 0 deletions remoting/tools/android_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env python
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

"""Converts a dotted-quad version string to a single numeric value suitable for
an Android package's internal version number."""

import sys

def main():
if len(sys.argv) != 2:
print "Usage: %s version-string" % sys.argv[0]
exit(1)

version_string = sys.argv[1]
version_components = version_string.split('.')
if len(version_components) != 4:
print "Expected 4 components."
exit(1)

branch = int(version_components[2])
patch = int(version_components[3])
print branch * 1000 + patch


if __name__ == '__main__':
main()

0 comments on commit 91029e6

Please sign in to comment.