diff options
| -rw-r--r-- | remoting/android/java/AndroidManifest.xml.jinja2 (renamed from remoting/android/java/AndroidManifest.xml) | 6 | ||||
| -rw-r--r-- | remoting/branding_Chrome | 1 | ||||
| -rw-r--r-- | remoting/branding_Chromium | 1 | ||||
| -rw-r--r-- | remoting/remoting_android.gypi | 33 |
4 files changed, 36 insertions, 5 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> diff --git a/remoting/branding_Chrome b/remoting/branding_Chrome index 54bb024..478d7f3 100644 --- a/remoting/branding_Chrome +++ b/remoting/branding_Chrome @@ -1,4 +1,5 @@ APK_FILE_NAME=ChromeRemoteDesktop +APK_PACKAGE_NAME=com.google.chromeremotedesktop DAEMON_FILE_NAME=Chrome Remote Desktop Host Service HOST_PLUGIN_FILE_NAME=Chrome Remote Desktop Host IT2ME_HOST_DESCRIPTION=Remote Assistance Host for Chrome Remote Desktop diff --git a/remoting/branding_Chromium b/remoting/branding_Chromium index d72b36c..dc945e2 100644 --- a/remoting/branding_Chromium +++ b/remoting/branding_Chromium @@ -1,4 +1,5 @@ APK_FILE_NAME=Chromoting +APK_PACKAGE_NAME=org.chromium.chromoting DAEMON_FILE_NAME=Chromoting Host Service HOST_PLUGIN_FILE_NAME=Chromoting Host IT2ME_HOST_DESCRIPTION=Remote Assistance Host for Chromoting diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 950bc46..1d2c74c 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -76,19 +76,48 @@ ], }, # end of target 'remoting_android_resources' { + 'target_name': 'remoting_apk_manifest', + 'type': 'none', + 'sources': [ + 'android/java/AndroidManifest.xml.jinja2', + ], + 'rules': [{ + 'rule_name': 'generate_manifest', + 'extension': 'jinja2', + 'inputs': [ + '<(remoting_localize_path)', + '<(branding_path)', + '<(RULE_INPUT_PATH)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/remoting/android/<(RULE_INPUT_ROOT)', + ], + 'action': [ + 'python', '<(remoting_localize_path)', + '--variables', '<(branding_path)', + '--template', '<(RULE_INPUT_PATH)', + '--locale_output', '<@(_outputs)', + 'en', + ], + }], + }, # end of target 'remoting_apk_manifest' + { 'target_name': 'remoting_apk', 'type': 'none', 'dependencies': [ - 'remoting_client_jni', 'remoting_android_resources', + 'remoting_apk_manifest', + 'remoting_client_jni', ], 'variables': { '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', + 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/AndroidManifest.xml', 'native_lib_target': 'libremoting_client_jni', 'java_in_dir': 'android/java', + 'R_package': 'org.chromium.chromoting', + 'package_name': '<(_target_name)', 'additional_res_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res' ], 'additional_input_paths': [ '<(PRODUCT_DIR)/obj/remoting/remoting_android_resources.actions_rules_copies.stamp', |