diff options
| -rw-r--r-- | remoting/remoting_android.gypi | 2 | ||||
| -rwxr-xr-x | remoting/tools/android_version.py | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 38b0b81..3fd777f 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -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', diff --git a/remoting/tools/android_version.py b/remoting/tools/android_version.py new file mode 100755 index 0000000..da28bb1 --- /dev/null +++ b/remoting/tools/android_version.py @@ -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() |