ndk-build: Add support for <queries> element (#259)

Add support for <queries> element added to API level 30: https://developer.android.com/guide/topics/manifest/queries-element

Note: `<provider>` elements contained within `<queries>` only requires an `android:authorities` attribute, however `aapt` additionally demands `android:name` which is addressed in `aapt2`.

Co-authored-by: Marijn Suijten <[email protected]>

Author: korejan

cargo-apk/README.md

@@ -73,6 +73,27 @@ version = 1
 name = "android.permission.WRITE_EXTERNAL_STORAGE"
 max_sdk_version = 18
 
+# See https://developer.android.com/guide/topics/manifest/queries-element#provider
+[[package.metadata.android.queries.provider]]
+authorities = "org.khronos.openxr.runtime_broker;org.khronos.openxr.system_runtime_broker"
+# Note: The `name` attribute is normally not required for a queries provider, but is non-optional
+# as a workaround for aapt throwing errors about missing `android:name` attribute.
+# This will be made optional if/when cargo-apk migrates to aapt2.
+name = "org.khronos.openxr"
+
+# See https://developer.android.com/guide/topics/manifest/queries-element#intent
+[[package.metadata.android.queries.intent]]
+actions = ["android.intent.action.SEND"]
+
+# See https://developer.android.com/guide/topics/manifest/queries-element#intent
+# Note: there can be several .data entries.
+[[package.metadata.android.queries.intent.data]]
+mime_type = "image/jpeg"
+
+# See https://developer.android.com/guide/topics/manifest/queries-element#package
+[[package.metadata.android.queries.package]]
+name = "org.freedesktop.monado.openxr_runtime.in_process"
+
 # See https://developer.android.com/guide/topics/manifest/application-element
 [package.metadata.android.application]
 

ndk-build/CHANGELOG.md

@@ -7,6 +7,7 @@
   the default setup in `cargo-apk`. ([#241](https://github.com/rust-windowing/android-ndk-rs/pull/241))
 - Add `android:exported` attribute to the manifest's `Activity` element. ([#242](https://github.com/rust-windowing/android-ndk-rs/pull/242))
 - Add `android:sharedUserId` attribute to the manifest's top-level `manifest` element. ([#252](https://github.com/rust-windowing/android-ndk-rs/pull/252))
+- Add `queries` element to the manifest's top-level `manifest` element. ([#259](https://github.com/rust-windowing/android-ndk-rs/pull/259))
 
 # 0.4.3 (2021-11-22)
 

ndk-build/src/manifest.rs

@@ -29,6 +29,9 @@ pub struct AndroidManifest {
     #[serde(default)]
     pub uses_permission: Vec<Permission>,
 
+    #[serde(default)]
+    pub queries: Option<Queries>,
+
     #[serde(default)]
     pub application: Application,
 }
@@ -44,6 +47,7 @@ impl Default for AndroidManifest {
             sdk: Default::default(),
             uses_feature: Default::default(),
             uses_permission: Default::default(),
+            queries: Default::default(),
             application: Default::default(),
         }
     }
@@ -258,6 +262,36 @@ pub struct Permission {
     pub max_sdk_version: Option<u32>,
 }
 
+/// Android [package element](https://developer.android.com/guide/topics/manifest/queries-element#package).
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Package {
+    #[serde(rename(serialize = "android:name"))]
+    pub name: String,
+}
+
+/// Android [provider element](https://developer.android.com/guide/topics/manifest/queries-element#provider).
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct QueryProvider {
+    #[serde(rename(serialize = "android:authorities"))]
+    pub authorities: String,
+
+    // The specs say only an `authorities` attribute is required for providers contained in a `queries` element
+    // however this is required for aapt support and should be made optional if/when cargo-apk migrates to aapt2
+    #[serde(rename(serialize = "android:name"))]
+    pub name: String,
+}
+
+/// Android [queries element](https://developer.android.com/guide/topics/manifest/queries-element).
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Queries {
+    #[serde(default)]
+    pub package: Vec<Package>,
+    #[serde(default)]
+    pub intent: Vec<IntentFilter>,
+    #[serde(default)]
+    pub provider: Vec<QueryProvider>,
+}
+
 /// Android [uses-sdk element](https://developer.android.com/guide/topics/manifest/uses-sdk-element).
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Sdk {