Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Manifest (de)serialization #106

Merged
merged 17 commits into from
Apr 20, 2021
Merged

Manifest (de)serialization #106

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5626916
Implement proper (de)serialization of the new manifest structure
maxded Jan 4, 2021
4800613
Add Android manifest links to Manifest.rs
maxded Jan 4, 2021
cff8ed7
Move default deserialization values to `cargo-apk`
maxded Jan 4, 2021
771347a
Move default Android namespace implementation to `cargo-apk`
maxded Jan 4, 2021
7b28b1f
Moved default values back to `ndk-build` to better match previous imp…
maxded Jan 7, 2021
982f789
Implement missing `MAIN` action intent serialization
maxded Jan 25, 2021
891662b
Address feedback
maxded Mar 9, 2021
8f7a202
Merge branch 'upstream-master' into manifest-(de)serialization
maxded Mar 9, 2021
2a89410
Cargo fmt + small fix
maxded Mar 9, 2021
5a70437
Address feedback
maxded Mar 12, 2021
bb74854
fmt
maxded Mar 12, 2021
2c4be59
Address feedback
maxded Mar 15, 2021
3213760
- Mention what the Vulkan version numbers represent.
maxded Mar 18, 2021
a0a35ea
Small nits
maxded Mar 22, 2021
d8d8503
Merge branch 'upstream-master' into manifest-(de)serialization
maxded Mar 22, 2021
eb45af9
Fix cargo doc
maxded Mar 22, 2021
a9f8087
Use bufwriter
maxded Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 17 additions & 24 deletions ndk-build/src/manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::error::NdkError;
use serde::{Deserialize, Serialize, Serializer};
use std::{fs::File, path::Path};

/// See https://developer.android.com/guide/topics/manifest/manifest-element
/// Android [manifest element](https://developer.android.com/guide/topics/manifest/manifest-element), containing an [`Application`] element.
#[serde(rename = "manifest")]
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct AndroidManifest {
Expand Down Expand Up @@ -55,7 +55,7 @@ impl AndroidManifest {
}
}

/// See https://developer.android.com/guide/topics/manifest/application-element
/// Android [application element](https://developer.android.com/guide/topics/manifest/application-element), containing an [`Activity`] element.
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Application {
#[serde(rename(serialize = "android:debuggable"))]
Expand All @@ -78,7 +78,7 @@ pub struct Application {
pub activity: Activity,
}

/// See https://developer.android.com/guide/topics/manifest/activity-element
/// Android [activity element](https://developer.android.com/guide/topics/manifest/activity-element).
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Activity {
#[serde(rename(serialize = "android:configChanges"))]
Expand Down Expand Up @@ -140,13 +140,13 @@ where
seq.serialize_element(&IntentFilter {
actions: vec!["android.intent.action.MAIN".to_string()],
categories: vec!["android.intent.category.LAUNCHER".to_string()],
data: Vec::new(),
data: vec![],
})?;
}
seq.end()
}

/// See https://developer.android.com/guide/topics/manifest/intent-filter-element
/// Android [intent filter element](https://developer.android.com/guide/topics/manifest/intent-filter-element).
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct IntentFilter {
/// Serialize strings wrapped in `<action android:name="..." />`
Expand Down Expand Up @@ -204,7 +204,7 @@ where
seq.end()
}

/// See https://developer.android.com/guide/topics/manifest/data-element
/// Android [intent filter data element](https://developer.android.com/guide/topics/manifest/data-element).
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct IntentFilterData {
#[serde(rename(serialize = "android:scheme"))]
Expand All @@ -223,7 +223,7 @@ pub struct IntentFilterData {
pub mime_type: Option<String>,
}

/// See https://developer.android.com/guide/topics/manifest/meta-data-element
/// Android [meta-data element](https://developer.android.com/guide/topics/manifest/meta-data-element).
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct MetaData {
#[serde(rename(serialize = "android:name"))]
Expand All @@ -232,30 +232,23 @@ pub struct MetaData {
pub value: String,
}

/// https://developer.android.com/guide/topics/manifest/uses-feature-element
/// Android [uses-feature element](https://developer.android.com/guide/topics/manifest/uses-feature-element).
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Feature {
#[serde(rename(serialize = "android:name"))]
pub name: Option<String>,
#[serde(rename(serialize = "android:required"))]
pub required: Option<bool>,
/// The `version` field is used for Vulkan specific hardware features. `version`
/// indicates different requirements based on the `name` field as desribed below:
/// The `version` field is currently used for the following features:
///
/// - name: "android.hardware.vulkan.compute", `version` indicates which level of
/// optional compute features the app requires beyond the Vulkan 1.0 requirements.
/// - `name="android.hardware.vulkan.compute"`: The minimum level of compute features required. See the [Android documentation](https://developer.android.com/reference/android/content/pm/PackageManager#FEATURE_VULKAN_HARDWARE_COMPUTE)
/// for available levels and the respective Vulkan features required/provided.
///
/// More detail: <https://developer.android.com/reference/android/content/pm/PackageManager#FEATURE_VULKAN_HARDWARE_COMPUTE>
/// - `name="android.hardware.vulkan.level"`: The minimum Vulkan requirements. See the [Android documentation](https://developer.android.com/reference/android/content/pm/PackageManager#FEATURE_VULKAN_HARDWARE_LEVEL)
/// for available levels and the respective Vulkan features required/provided.
///
/// - name "android.hardware.vulkan.level", `version` indicates which level of
/// optional hardware features the app requires.
///
/// More detail: <https://developer.android.com/reference/android/content/pm/PackageManager#FEATURE_VULKAN_HARDWARE_LEVEL>
///
/// - name "android.hardware.vulkan.compute", `version` indicates the minimum version
/// of Vulkan API support the app requires.
///
/// More detail: <https://developer.android.com/reference/android/content/pm/PackageManager#FEATURE_VULKAN_HARDWARE_VERSION>
/// - `name="android.hardware.vulkan.version"`: The minimum version of the Vulkan API required. See the [Android documentation](https://developer.android.com/reference/android/content/pm/PackageManager#FEATURE_VULKAN_HARDWARE_VERSION)
/// for available levels and the respective Vulkan features required/provided.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps worth mentioning that this is a bitmask with the same encoding as Vulkan version numbers, representing the value of VkPhysicalDeviceProperties::apiVersion (and has nothing to do with Vulkan features in the sense as the other two features).

#[serde(rename(serialize = "android:version"))]
pub version: Option<u32>,
#[serde(rename(serialize = "android:glEsVersion"))]
Expand All @@ -279,7 +272,7 @@ where
}
}

/// See https://developer.android.com/guide/topics/manifest/uses-permission-element
/// Android [uses-permission element](https://developer.android.com/guide/topics/manifest/uses-permission-element).
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Permission {
#[serde(rename(serialize = "android:name"))]
Expand All @@ -288,7 +281,7 @@ pub struct Permission {
pub max_sdk_version: Option<u32>,
}

/// https://developer.android.com/guide/topics/manifest/uses-sdk-element
/// Android [uses-sdk element](https://developer.android.com/guide/topics/manifest/uses-sdk-element).
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Sdk {
#[serde(rename(serialize = "android:minSdkVersion"))]
Expand Down