Skip to content

Commit

Permalink
Use the same version_code and version_name for remoting_apk as chrome…
Browse files Browse the repository at this point in the history
…_apk

This CL:
- Changes remoting_apk in GYP so that it uses the same version_code and
  version_name as chrome_apk
- Declares new GN variables so that remoting_apk in GN can share the
  same version_code and version_name as chrome_apk. (CL which ports remoting_apk
  to GN is at https://codereview.chromium.org/1473713005/)

BUG=544298

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

Cr-Commit-Position: refs/heads/master@{#363266}
  • Loading branch information
pkotwicz authored and Commit bot committed Dec 4, 2015
1 parent da18b59 commit ee3823c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 30 deletions.
8 changes: 8 additions & 0 deletions chrome/android/chrome_apk_version.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright 2015 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.

declare_args() {
chrome_apk_version_code = "1"
chrome_apk_version_name = "Developer Build"
}
2 changes: 0 additions & 2 deletions remoting/remoting_android.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@
],
'variables': {
'apk_name': 'Chromoting',
'android_app_version_name': '<(version_full)',
'android_app_version_code': '<!(python tools/android_version.py <(android_app_version_name))',
'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/AndroidManifest.xml',
'java_in_dir': '<(remoting_apk_java_in_dir)',
'native_lib_target': 'libremoting_client_jni',
Expand Down
28 changes: 0 additions & 28 deletions remoting/tools/android_version.py

This file was deleted.

0 comments on commit ee3823c

Please sign in to comment.