[Android] Enable WebAPK to have multiple intent filters

chrome/android/webapk/shell_apk/AndroidManifest.xml

Index: chrome/android/webapk/shell_apk/AndroidManifest.xml
diff --git a/chrome/android/webapk/shell_apk/AndroidManifest.xml b/chrome/android/webapk/shell_apk/AndroidManifest.xml
index 9aa46e7793aa5f7d3290bbf7d176c961ed4affc6..5fe0bd47a900a88f65c1481dacb6d50deb5095b9 100644
--- a/chrome/android/webapk/shell_apk/AndroidManifest.xml
+++ b/chrome/android/webapk/shell_apk/AndroidManifest.xml
@@ -24,16 +24,20 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            {{#intent_filters:intent_filters}}

[Yaron, 2017/06/28 16:55:40]

I'm not familiar with this syntax but have you verified it works with the server
implementation?

[hartmanng, 2017/06/28 18:24:33]

it doesn't as-is. The changes to make it work on the server are easy, but I
can't promise it'll still work on the client afterwards...

Changes required:
- the server doesn't like {{#intent_filters:intent_filters}} ("interleaved
closing tag: intent_filters"), but seems to work fine with just
{{#intent_filters}}.
- the "inner" variables ("intent_filters.scope_url_scheme", etc) don't expect
the "intent_filters." prefix on the server implementation. They seem to just
want "scope_url_scheme". 

[Yaron, 2017/06/28 18:28:47]

Ya, those match my expectations. I would think that it would work on the client
but I've been (unpleasantly) surprised by its impl before

[pkotwicz, 2017/06/28 20:45:06]

It doesn't. The server will have the process the AndroidManifest.xml to convert
the MoTemplate syntax to Mustache.

Converting from MoTemplate to Mustache is easy. (Remove the text before the ':')

For the sake of clarity, MoTemplate rejects the Mustache syntax that you are
familiar with

[hartmanng, 2017/06/28 21:01:29]

Just to be completely explicit here: the part of this comment that says "The
server will have the process the AndroidManifest.xml to convert the MoTemplate
syntax to Mustache" is no longer true in the most recent patchset, correct?

             <intent-filter>
                 <action android:name="android.intent.action.VIEW"></action>
                 <category android:name="android.intent.category.DEFAULT"></category>
                 <category android:name="android.intent.category.BROWSABLE"></category>
-                <data android:scheme="{{{scope_url_scheme}}}" android:host="{{{scope_url_host}}}" android:pathPrefix="{{{scope_url_path}}}"></data>
+                <data android:scheme="{{{intent_filters.scope_url_scheme}}}" android:host="{{{intent_filters.scope_url_host}}}" android:pathPrefix="{{{intent_filters.scope_url_path}}}"></data>
             </intent-filter>
+            {{/intent_filters}}
         </activity>
         <meta-data android:name="org.chromium.webapk.shell_apk.shellApkVersion" android:value="{{{shell_apk_version}}}" />
-        {{#runtime_host}}<meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" android:value="{{{runtime_host}}}" />{{/runtime_host}}
-        {{#runtime_host_application_name}}<meta-data android:name="org.chromium.webapk.shell_apk.runtimeHostApplicationName" android:value="{{{runtime_host_application_name}}}" />{{/runtime_host_application_name}}
+        {{#bound_webapk}}
+        <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" android:value="{{{runtime_host}}}" />
+        <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHostApplicationName" android:value="{{{runtime_host_application_name}}}" />
+        {{/bound_webapk}}
         <meta-data android:name="org.chromium.webapk.shell_apk.startUrl" android:value="{{{start_url}}}" />
         <meta-data android:name="org.chromium.webapk.shell_apk.scope" android:value="{{{scope_url}}}" />
         <meta-data android:name="org.chromium.webapk.shell_apk.displayMode" android:value="{{{display_mode}}}" />
@@ -41,7 +45,12 @@
         <meta-data android:name="org.chromium.webapk.shell_apk.themeColor" android:value="{{{theme_color}}}" />
         <meta-data android:name="org.chromium.webapk.shell_apk.backgroundColor" android:value="{{{background_color}}}" />
         <meta-data android:name="org.chromium.webapk.shell_apk.iconId" android:resource="@mipmap/app_icon" />
+
+        <!-- Hashes of icons should be taken of the icons as they are available on the web. The icon

[Yaron, 2017/06/28 16:59:39]

Use mustache comment {{! instaed

[pkotwicz, 2017/06/28 20:45:06]

Done.

Does Android keep XML comments when it constructs the .apk?

+             bytes should not be transformed (e.g. decoded / encoded) prior to taking the hash.
+          -->
         <meta-data android:name="org.chromium.webapk.shell_apk.iconUrlsAndIconMurmur2Hashes" android:value="{{{icon_urls_and_icon_murmur2_hashes}}}" />
+
         <meta-data android:name="org.chromium.webapk.shell_apk.webManifestUrl" android:value="{{{web_manifest_url}}}" />
         <service
             android:name="org.chromium.webapk.shell_apk.WebApkServiceFactory"