diff --git a/.gitignore b/.gitignore index 212de44..828887d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /target -.DS_Store \ No newline at end of file +.DS_Store +*.jar +**/*/android \ No newline at end of file diff --git a/lib/libdl.txt b/lib/libdl.txt new file mode 100644 index 0000000..2a84648 --- /dev/null +++ b/lib/libdl.txt @@ -0,0 +1,3 @@ +git clone https://github.com/skylot/jadx.git +cd jadx +./gradlew dist \ No newline at end of file diff --git a/src/firmware/xbuilder.rs b/src/firmware/xbuilder.rs index 7e6b6c3..8388fa1 100644 --- a/src/firmware/xbuilder.rs +++ b/src/firmware/xbuilder.rs @@ -4,7 +4,7 @@ use std::fs::File; use chrono::{DateTime, Utc}; -use rayon::iter::{ParallelBridge, ParallelIterator}; +use rayon::iter::{IntoParallelIterator, ParallelBridge, ParallelIterator}; use tar::Archive; use crate::recipe_functions::common::{self, EnumAsValue}; @@ -281,7 +281,7 @@ impl XBuilder { self.base = Some(base); } - /// get last commit that should add to file + /// get file from commit(s) that should be added to newer firmware file pub fn sync_file_list(&mut self) -> Vec { let mut result = Vec::new();