[go: up one dir, main page]

[remoting][android] Fix Android client version number

For some reason Android client's version number is not properly set on
the M76 build. It says "Developer Build" even on the official build app.
Maybe the default version number have been changed from Chrome's version
number to the "Developer Build" string.

This CL explicitly sets the version number to Chrome's version number on
the build target.

(cherry picked from commit 7e18d520e9ca510fbe5882b8f4cae83fdb833c19)

Bug: 973196
Change-Id: I8c901042d22dfd87a7f3cc288412d1f21cea6df3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1653988
Commit-Queue: Yuwei Huang <yuweih@chromium.org>
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Auto-Submit: Yuwei Huang <yuweih@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#668135}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1655387
Reviewed-by: Yuwei Huang <yuweih@chromium.org>
Cr-Commit-Position: refs/branch-heads/3809@{#266}
Cr-Branched-From: d82dec1a818f378c464ba307ddd9c92133eac355-refs/heads/master@{#665002}
diff --git a/remoting/android/remoting_apk_tmpl.gni b/remoting/android/remoting_apk_tmpl.gni
index 7519a7691..0ebd46e 100644
--- a/remoting/android/remoting_apk_tmpl.gni
+++ b/remoting/android/remoting_apk_tmpl.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
+import("//build/util/version.gni")
 import("//remoting/remoting_options.gni")
 
 template("remoting_apk_tmpl") {
@@ -14,5 +15,6 @@
     android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
     android_manifest_dep = "//remoting/android:remoting_apk_manifest"
     shared_libraries = [ "//remoting/client/jni:remoting_client_jni" ]
+    version_name = chrome_version_name
   }
 }