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/remoting_android.gypi | |
| 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/remoting_android.gypi')
| -rw-r--r-- | remoting/remoting_android.gypi | 33 |
1 files changed, 31 insertions, 2 deletions
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', |