diff options
| author | Tarun Nainani <tnainani@codeaurora.org> | 2015-05-01 15:52:05 -0700 |
|---|---|---|
| committer | WebTech Code Review <code-review@localhost> | 2015-05-08 09:34:07 -0700 |
| commit | 9f0039d6e2edc64c3a6eb6dad428063fab31303b (patch) | |
| tree | 18df502f4b8323289d4267411aa8f90e8a6cb078 /swe_android_browser.gypi | |
| parent | c6b5c32449038a3ec4389939c314f7ec223a1d4e (diff) | |
| download | android_packages_apps_Gello-9f0039d6e2edc64c3a6eb6dad428063fab31303b.tar.gz android_packages_apps_Gello-9f0039d6e2edc64c3a6eb6dad428063fab31303b.tar.bz2 android_packages_apps_Gello-9f0039d6e2edc64c3a6eb6dad428063fab31303b.zip | |
SWE Browser to use generated android manifest xml
Keep single android manifest for all SWE Browser flavors.
Delete src_system/AndrodManifest.xml and use 'swe_browser_type'
gyp (jinja) variable to differentiate between standalone vs
system browser.
Change-Id: I85e5ddce48f95c398959a2e64141c87e4c83e110
Diffstat (limited to 'swe_android_browser.gypi')
| -rw-r--r-- | swe_android_browser.gypi | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi index 4d3a70a7..ce875e57 100644 --- a/swe_android_browser.gypi +++ b/swe_android_browser.gypi @@ -1,4 +1,7 @@ { + 'variables' : { + 'manifest_package_name%' : 'org.codeaurora.swe.browser.beta', + }, 'targets' : [ { 'target_name': 'swe_android_browser_apk', @@ -12,9 +15,7 @@ ], 'variables': { 'apk_name': 'SWE_AndroidBrowser', - 'manifest_package_name': 'com.android.browser', 'native_lib_version_name': '<(version_full)', - #'package_name': 'swe_android_browser_apk', 'java_in_dir': '.', 'resource_dir': '../browser/res', 'assets_dir': '../../swe/browser/assets', @@ -44,8 +45,8 @@ 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ], - 'override_package_name': 'org.codeaurora.swe.browser.beta', - 'android_manifest_path': '../../swe/browser/AndroidManifest.xml', + 'override_package_name': '<(manifest_package_name)', + 'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/swe_android_browser_apk/AndroidManifest.xml', 'additional_src_dirs': ['<(DEPTH)/swe/browser/src_standalone/com/android/browser'], }, @@ -67,5 +68,21 @@ ], 'includes': [ '../../build/java_apk.gypi' ], }, + { + 'target_name': 'swe_android_browser_apk_manifest', + 'type': 'none', + 'variables': { + 'jinja_inputs': ['<(DEPTH)/swe/browser/AndroidManifest.xml', + ], + 'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/swe_android_browser_apk/AndroidManifest.xml', + 'standalone_manifest_package_name' : 'org.codeaurora.swe.browser.beta', + 'jinja_variables': ['package_name=<(standalone_manifest_package_name)', + 'apk_label=@string/application_name_swe', + 'apk_icon=@mipmap/ic_launcher_browser_swe_beta', + 'apk_task_affinity=<(standalone_manifest_package_name)', + 'apk_authorities=swe.browser.beta',], + }, + 'includes': [ '../../build/android/jinja_template.gypi' ], + }, ], } |