summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-24 15:10:08 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-24 15:10:08 +0000
commit5f191845cec2a7ca702e8d495a93abf40ac9f2d4 (patch)
tree70cb9fc8b9cc89759c0d771afff95f8abef81780 /remoting
parentbb5c95c9bff8920f56d1737b27e2eb1ae99c54ad (diff)
downloadchromium_src-5f191845cec2a7ca702e8d495a93abf40ac9f2d4.zip
chromium_src-5f191845cec2a7ca702e8d495a93abf40ac9f2d4.tar.gz
chromium_src-5f191845cec2a7ca702e8d495a93abf40ac9f2d4.tar.bz2
Set version numbers in Chromoting Android package
This sets the human-readable version number to the Chrome version, and the internal version code to the Chrome revision. TEST=Run 'aapt dump badging out/Debug/apks/Chromoting.apk | grep version' Review URL: https://chromiumcodereview.appspot.com/22926023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/android/java/AndroidManifest.xml4
-rw-r--r--remoting/remoting.gyp2
2 files changed, 3 insertions, 3 deletions
diff --git a/remoting/android/java/AndroidManifest.xml b/remoting/android/java/AndroidManifest.xml
index 7a21b2d..26b6d77 100644
--- a/remoting/android/java/AndroidManifest.xml
+++ b/remoting/android/java/AndroidManifest.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.chromoting"
- android:versionCode="11"
- android:versionName="0.11">
+ package="org.chromium.chromoting">
<uses-sdk android:minSdkVersion="14"
android:targetSdkVersion="14"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 89ad20d..ec6d747 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1857,6 +1857,8 @@
],
'variables': {
'apk_name': 'Chromoting',
+ 'android_app_version_name': '<(version_full)',
+ 'android_app_version_code': '<!(python ../build/util/lastchange.py --revision-only)',
'manifest_package_name': 'org.chromium.chromoting',
'native_lib_target': 'libremoting_client_jni',
'java_in_dir': 'android/java',