diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2015-11-12 12:13:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-12 20:14:57 +0000 |
| commit | 33d1990883f21823fa776d938f2d2b8dd86ddfcb (patch) | |
| tree | 88f49d3cadce19d17391268f295bc7bb121e6d71 | |
| parent | 94135efa12df3d877c1059534dc5a4eda68f4224 (diff) | |
| download | chromium_src-33d1990883f21823fa776d938f2d2b8dd86ddfcb.zip chromium_src-33d1990883f21823fa776d938f2d2b8dd86ddfcb.tar.gz chromium_src-33d1990883f21823fa776d938f2d2b8dd86ddfcb.tar.bz2 | |
Change filename produced by remoting_apk target.
This modifies the remoting_apk target to unconditionally build
'Chromoting.apk' instead of 'ChromeRemoteDesktop.apk' on the official
builders. This is to avoid a naming collision with a separate target
which will be introduced on the official builders.
BUG=517688
Review URL: https://codereview.chromium.org/1436613003
Cr-Commit-Position: refs/heads/master@{#359368}
| -rw-r--r-- | remoting/branding_Chrome | 1 | ||||
| -rw-r--r-- | remoting/branding_Chromium | 1 | ||||
| -rw-r--r-- | remoting/remoting_android.gypi | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/remoting/branding_Chrome b/remoting/branding_Chrome index 630d407..86d6fa2e 100644 --- a/remoting/branding_Chrome +++ b/remoting/branding_Chrome @@ -1,4 +1,3 @@ -APK_FILE_NAME=ChromeRemoteDesktop APK_PACKAGE_NAME=com.google.chromeremotedesktop DAEMON_FILE_NAME=Chrome Remote Desktop Host Service IT2ME_HOST_DESCRIPTION=Remote Assistance Host for Chrome Remote Desktop diff --git a/remoting/branding_Chromium b/remoting/branding_Chromium index 889d3c5..3c3a43d 100644 --- a/remoting/branding_Chromium +++ b/remoting/branding_Chromium @@ -1,4 +1,3 @@ -APK_FILE_NAME=Chromoting APK_PACKAGE_NAME=org.chromium.chromoting DAEMON_FILE_NAME=Chromoting Host Service IT2ME_HOST_DESCRIPTION=Remote Assistance Host for Chromoting diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 6bbb653..59c12a4 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -172,7 +172,7 @@ '<@(remoting_apk_extra_dependencies)', ], 'variables': { - 'apk_name': '<!(python <(version_py_path) -f <(branding_path) -t "@APK_FILE_NAME@")', + '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', |