Added support for adding extra files to the APK.

cargo-apk/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- Added support for adding extra files to the APK.
+
 # 0.5.6 (2020-11-25)
 
 - Use `dunce::simplified` when extracting the manifest's assets and resource folder

cargo-apk/README.md

@@ -88,6 +88,11 @@ res = "path/to/res_folder"
 # If not specified, assets will not be included in the APK
 assets = "path/to/assets_folder"
 
+# Path to a folder containing a hierarchy of extra files to be added at the root of the APK.
+# All files will be added to the APK recursively.
+# If not specified, no extra files will be added to the APK
+extra_content = "path/to/extra_content_folder"
+
 # Adds application metadata to the manifest
 # Note that there can be several application_metadatas entries
 # this will add: <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>

cargo-apk/src/apk.rs

@@ -87,6 +87,17 @@ impl<'a> ApkBuilder<'a> {
                 )
                 .to_owned()
             }),
+            extra_content: self.manifest.extra_content.as_ref().map(|res| {
+                dunce::simplified(
+                    &self
+                        .cmd
+                        .manifest()
+                        .parent()
+                        .expect("invalid manifest path")
+                        .join(&res),
+                )
+                .to_owned()
+            }),
         };
 
         let config = ApkConfig::from_config(config, self.manifest.metadata.clone());
@@ -125,6 +136,10 @@ impl<'a> ApkBuilder<'a> {
             apk.add_lib_recursively(&artifact, *target, libs_search_paths.as_slice())?;
         }
 
+        if let Some(content_dir) = &config.extra_content {
+            apk.add_content_dir_recursively(content_dir)?;
+        }
+
         Ok(apk.align()?.sign(config.ndk.debug_key()?)?)
     }
 

cargo-apk/src/manifest.rs

@@ -10,6 +10,7 @@ pub struct Manifest {
     pub build_targets: Vec<Target>,
     pub assets: Option<String>,
     pub res: Option<String>,
+    pub extra_content: Option<String>,
 }
 
 impl Manifest {
@@ -28,6 +29,7 @@ impl Manifest {
             build_targets: metadata.build_targets.unwrap_or_default(),
             assets: metadata.assets,
             res: metadata.res,
+            extra_content: metadata.extra_content,
         })
     }
 }
@@ -55,4 +57,5 @@ struct AndroidMetadata {
     build_targets: Option<Vec<Target>>,
     assets: Option<String>,
     res: Option<String>,
+    extra_content: Option<String>,
 }

ndk-build/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- Added support for adding extra files to the APK.
+
 # 0.1.4 (2020-11-25)
 
 - On Windows, fixed UNC path handling for resource folder

ndk-build/src/apk.rs

@@ -3,15 +3,19 @@ use crate::error::NdkError;
 use crate::manifest::Manifest;
 use crate::ndk::{Key, Ndk};
 use crate::target::Target;
-use std::path::{Path, PathBuf};
 use std::process::Command;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 
 pub struct ApkConfig {
     pub ndk: Ndk,
     pub build_dir: PathBuf,
     pub assets: Option<PathBuf>,
     pub res: Option<PathBuf>,
     pub manifest: Manifest,
+    pub extra_content: Option<PathBuf>,
 }
 
 impl ApkConfig {
@@ -77,6 +81,7 @@ impl ApkConfig {
             assets: config.assets,
             res: config.res,
             manifest,
+            extra_content: config.extra_content,
         }
     }
 
@@ -155,6 +160,41 @@ impl<'a> UnalignedApk<'a> {
         Ok(())
     }
 
+    pub fn add_file(&self, base_path: &Path, path: &Path) -> Result<(), NdkError> {
+        let out = self.0.build_dir.join(path);
+        let out_dir = out.parent().unwrap();
+        std::fs::create_dir_all(&out_dir)?;
+        std::fs::copy(base_path.join(path), out)?;
+
+        let mut aapt = self.0.build_tool(bin!("aapt"))?;
+        aapt.arg("add").arg(self.0.unaligned_apk()).arg(path);
+        if !aapt.status()?.success() {
+            return Err(NdkError::CmdFailed(aapt));
+        }
+        Ok(())
+    }
+
+    fn add_entry(&self, base_path: &Path, path: &Path) -> Result<(), NdkError> {
+        let full_path = base_path.join(path);
+        if full_path.is_dir() {
+            for entry in fs::read_dir(full_path)? {
+                let entry = entry?;
+                let tgt_path = path.join(entry.file_name());
+                self.add_entry(base_path, &tgt_path)?;
+            }
+        } else if full_path.is_file() {
+            self.add_file(base_path, path)?;
+        }
+        Ok(())
+    }
+
+    pub fn add_content_dir_recursively(&self, content_dir: &Path) -> Result<(), NdkError> {
+        if !content_dir.is_dir() {
+            return Err(NdkError::PathInvalid(content_dir.to_path_buf()));
+        }
+        self.add_entry(&content_dir, Path::new(""))
+    }
+
     pub fn align(self) -> Result<UnsignedApk<'a>, NdkError> {
         let mut zipalign = self.0.build_tool(bin!("zipalign"))?;
         zipalign

ndk-build/src/config.rs

@@ -18,6 +18,7 @@ pub struct Config {
     pub debuggable: bool,
     pub assets: Option<PathBuf>,
     pub res: Option<PathBuf>,
+    pub extra_content: Option<PathBuf>,
 }
 
 #[derive(Clone, Debug, Default, Deserialize)]

ndk-build/src/error.rs

@@ -25,6 +25,8 @@ pub enum NdkError {
     },
     #[error("Path `{0:?}` doesn't exist.")]
     PathNotFound(PathBuf),
+    #[error("Path `{0:?}` is invalid.")]
+    PathInvalid(PathBuf),
     #[error("Command `{0}` not found.")]
     CmdNotFound(String),
     #[error("Android SDK has no build tools.")]