diff options
author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 13:01:38 +0000 |
---|---|---|
committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 13:01:38 +0000 |
commit | d21f4831f923e709a11fd23445bb752b39a14224 (patch) | |
tree | c6c931c5ebe3a53e091b31a562d515f373acdab7 /remoting/android | |
parent | f5d3f14f81c0261dbdc3c848a60accf292ddcc29 (diff) | |
download | chromium_src-d21f4831f923e709a11fd23445bb752b39a14224.zip chromium_src-d21f4831f923e709a11fd23445bb752b39a14224.tar.gz chromium_src-d21f4831f923e709a11fd23445bb752b39a14224.tar.bz2 |
Set package name for official builds of Android Chromoting
TEST=Build remoting_apk with branding=Chrome, verify it runs OK, and verify 'aapt dump badging out/Debug/apks/ChromeRemoteDesktop.apk' shows new package name.
Review URL: https://codereview.chromium.org/155083003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/android')
-rw-r--r-- | remoting/android/java/AndroidManifest.xml.jinja2 (renamed from remoting/android/java/AndroidManifest.xml) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/android/java/AndroidManifest.xml b/remoting/android/java/AndroidManifest.xml.jinja2 index c5c0ce4..ba07b53 100644 --- a/remoting/android/java/AndroidManifest.xml +++ b/remoting/android/java/AndroidManifest.xml.jinja2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.chromium.chromoting"> + package="{{ APK_PACKAGE_NAME }}"> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/> <uses-permission android:name="android.permission.GET_ACCOUNTS"/> @@ -9,14 +9,14 @@ <uses-permission android:name="android.permission.USE_CREDENTIALS"/> <application android:label="@string/product_name" android:icon="@drawable/chromoting128"> - <activity android:name="Chromoting" + <activity android:name="org.chromium.chromoting.Chromoting" android:configChanges="orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> - <activity android:name="Desktop" + <activity android:name="org.chromium.chromoting.Desktop" android:configChanges="orientation|screenSize" android:windowSoftInputMode="adjustResize"/> </application> |