From 2f7c5984b86186dedeb17d551b9159df0462a8b5 Mon Sep 17 00:00:00 2001 From: newt Date: Thu, 18 Jun 2015 21:24:55 -0700 Subject: Move AndroidManifest.xml from java_staging to java. This leaves a copy of AndroidManifest.xml in java_staging, which will be removed once downstream targets are updated. BUG=501140 Review URL: https://codereview.chromium.org/1190183004 Cr-Commit-Position: refs/heads/master@{#335206} --- chrome/android/BUILD.gn | 2 +- chrome/android/chrome_apk.gyp | 2 +- chrome/android/java/AndroidManifest.xml | 592 ++++++++++++++++++++++++++++++++ 3 files changed, 594 insertions(+), 2 deletions(-) create mode 100644 chrome/android/java/AndroidManifest.xml (limited to 'chrome') diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 9316bdc..52e65d5 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -751,7 +751,7 @@ copy_ex("chrome_public_apk_assets") { # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest jinja_template("chrome_public_apk_manifest") { - input = "java_staging/AndroidManifest.xml" + input = "java/AndroidManifest.xml" output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" variables = jinja_variables variables += [ diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index 239236d..87078c9 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -270,7 +270,7 @@ 'target_name': 'chrome_public_manifest', 'type': 'none', 'variables': { - 'jinja_inputs': ['<(chrome_java_dir)/AndroidManifest.xml'], + 'jinja_inputs': ['java/AndroidManifest.xml'], 'jinja_output': '<(chrome_public_apk_manifest)', 'jinja_variables': [ 'channel=<(android_channel)', diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml new file mode 100644 index 0000000..46a755f --- /dev/null +++ b/chrome/android/java/AndroidManifest.xml @@ -0,0 +1,592 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% block extra_uses_permissions %} + {% endblock %} + + + + + + + + + + + + + + + + + + + + {% if channel in ['dev', 'canary', 'default'] %} + + {% endif %} + {% if configuration_policy == '1' %} + + {% endif %} + + + + + + + + + + + + + {% if channel in ['dev', 'canary', 'default'] %} + + {% endif %} + + + + + + + {% if channel in ['stable', 'default'] %}{% endif %} + + + + + + + + + + + {% if channel in ['stable', 'default'] %}{% endif %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% for i in range(10) %} + + + + + {% endfor %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% set num_sandboxed_services = 20 %} + + {% for i in range(num_sandboxed_services) %} + + {% endfor %} + + {% set num_privileged_services = 3 %} + + {% for i in range(num_privileged_services) %} + + {% endfor %} + + + + + + + + + + + + + + + + + + + + + + + + + + + {% block extra_application_definitions %} + {% endblock %} + + -- cgit v1.1