summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 23:15:39 +0000
committerlambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 23:15:39 +0000
commita3d61a1c724d8db18fb4b08a453005ab238e5089 (patch)
tree9a95aea85ad2b7828728f64bd4659e3e06516fd7
parentf9d10c2d2b99551e5c84004bf173c3c01578615d (diff)
downloadchromium_src-a3d61a1c724d8db18fb4b08a453005ab238e5089.zip
chromium_src-a3d61a1c724d8db18fb4b08a453005ab238e5089.tar.gz
chromium_src-a3d61a1c724d8db18fb4b08a453005ab238e5089.tar.bz2
Change output filename for official builds of Android Chromoting
Official builds will produce ChromeRemoteDesktop.apk instead of Chromoting.apk R=kerz@chromium.org, sergeyu@chromium.org Review URL: https://codereview.chromium.org/141213003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245370 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/branding_Chrome5
-rw-r--r--remoting/branding_Chromium5
-rw-r--r--remoting/remoting_android.gypi2
3 files changed, 7 insertions, 5 deletions
diff --git a/remoting/branding_Chrome b/remoting/branding_Chrome
index ed6bfc0..eef334d 100644
--- a/remoting/branding_Chrome
+++ b/remoting/branding_Chrome
@@ -1,9 +1,10 @@
-HOST_PLUGIN_FILE_NAME=Chrome Remote Desktop Host
+APK_FILE_NAME=ChromeRemoteDesktop
DAEMON_FILE_NAME=Chrome Remote Desktop Host Service
+HOST_PLUGIN_FILE_NAME=Chrome Remote Desktop Host
MAC_BUNDLE_ID=com.google.Chrome
MAC_CREATOR=rimZ
MAC_HOST_BUNDLE_ID=com.google.chromeremotedesktop.me2me-host
+MAC_PREFPANE_BUNDLE_ID=com.google.chromeremotedesktop.preferences
MAC_UNINSTALLER_NAME=Chrome Remote Desktop Host Uninstaller
MAC_UNINSTALLER_BUNDLE_PREFIX=com.google.pkg
MAC_UNINSTALLER_BUNDLE_ID=com.google.chromeremotedesktop.me2me-host-uninstaller
-MAC_PREFPANE_BUNDLE_ID=com.google.chromeremotedesktop.preferences
diff --git a/remoting/branding_Chromium b/remoting/branding_Chromium
index 39771c5..ce0559b 100644
--- a/remoting/branding_Chromium
+++ b/remoting/branding_Chromium
@@ -1,9 +1,10 @@
-HOST_PLUGIN_FILE_NAME=Chromoting Host
+APK_FILE_NAME=Chromoting
DAEMON_FILE_NAME=Chromoting Host Service
+HOST_PLUGIN_FILE_NAME=Chromoting Host
MAC_BUNDLE_ID=org.chromium.Chromium
MAC_CREATOR=Cr24
MAC_HOST_BUNDLE_ID=org.chromium.chromoting.me2me-host
+MAC_PREFPANE_BUNDLE_ID=org.chromium.remoting.preferences
MAC_UNINSTALLER_NAME=Chromoting Host Uninstaller
MAC_UNINSTALLER_BUNDLE_PREFIX=org.chromium.pkg
MAC_UNINSTALLER_BUNDLE_ID=org.chromium.chromoting.me2me-host-uninstaller
-MAC_PREFPANE_BUNDLE_ID=org.chromium.remoting.preferences
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 3fd777f..00c21cd 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -83,7 +83,7 @@
'remoting_android_resources',
],
'variables': {
- 'apk_name': 'Chromoting',
+ 'apk_name': '<!(python <(version_py_path) -f <(branding_path) -t "@APK_FILE_NAME@")',
'android_app_version_name': '<(version_full)',
'android_app_version_code': '<!(python tools/android_version.py <(android_app_version_name))',
'manifest_package_name': 'org.chromium.chromoting',