Merge "libfdt: Fix method documentation style" into main
diff --git a/Android.bp b/Android.bp
index 2f6fc20..64d193a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,3 +64,9 @@
},
},
}
+
+genrule_defaults {
+ name: "dts_to_dtb",
+ tools: ["dtc"],
+ cmd: "$(location dtc) -I dts -O dtb $(in) -o $(out)",
+}
diff --git a/libs/apkverify/src/sigutil.rs b/libs/apkverify/src/sigutil.rs
index 395b493..99132b6 100644
--- a/libs/apkverify/src/sigutil.rs
+++ b/libs/apkverify/src/sigutil.rs
@@ -51,8 +51,8 @@
}
impl<R: Read + Seek> ApkSections<R> {
- pub fn new(reader: R) -> Result<ApkSections<R>> {
- let (mut reader, zip_sections) = zip_sections(reader)?;
+ pub fn new(mut reader: R) -> Result<ApkSections<R>> {
+ let zip_sections = zip_sections(&mut reader)?;
let (signing_block_offset, signing_block_size) =
find_signing_block(&mut reader, zip_sections.central_directory_offset)?;
Ok(ApkSections {
diff --git a/libs/apkverify/src/ziputil.rs b/libs/apkverify/src/ziputil.rs
index 5e513a7..715ea30 100644
--- a/libs/apkverify/src/ziputil.rs
+++ b/libs/apkverify/src/ziputil.rs
@@ -40,7 +40,7 @@
}
/// Discover the layout of a zip file.
-pub fn zip_sections<R: Read + Seek>(mut reader: R) -> Result<(R, ZipSections)> {
+pub fn zip_sections<R: Read + Seek>(mut reader: R) -> Result<ZipSections> {
// open a zip to parse EOCD
let archive = ZipArchive::new(reader)?;
let eocd_size = archive.comment().len() + EOCD_SIZE_WITHOUT_COMMENT;
@@ -65,15 +65,12 @@
"Invalid ZIP: EOCD should follow CD with no extra data or overlap."
);
- Ok((
- reader,
- ZipSections {
- central_directory_offset,
- central_directory_size,
- eocd_offset,
- eocd_size: eocd_size as u32,
- },
- ))
+ Ok(ZipSections {
+ central_directory_offset,
+ central_directory_size,
+ eocd_offset,
+ eocd_size: eocd_size as u32,
+ })
}
fn get_central_directory(buf: &[u8]) -> Result<(u32, u32)> {
@@ -109,7 +106,8 @@
#[test]
fn test_zip_sections() {
- let (cursor, sections) = zip_sections(create_test_zip()).unwrap();
+ let mut cursor = create_test_zip();
+ let sections = zip_sections(&mut cursor).unwrap();
assert_eq!(
sections.eocd_offset,
(cursor.get_ref().len() - EOCD_SIZE_WITHOUT_COMMENT) as u32
@@ -136,8 +134,8 @@
#[test]
fn test_zip_sections_with_apk() {
- let apk = File::open("tests/data/v3-only-with-stamp.apk").unwrap();
- let (mut reader, sections) = zip_sections(apk).unwrap();
+ let mut reader = File::open("tests/data/v3-only-with-stamp.apk").unwrap();
+ let sections = zip_sections(&mut reader).unwrap();
// Checks Central directory.
assert_eq!(
diff --git a/libs/libfdt/Android.bp b/libs/libfdt/Android.bp
index 402040c..0a05471 100644
--- a/libs/libfdt/Android.bp
+++ b/libs/libfdt/Android.bp
@@ -66,28 +66,28 @@
genrule {
name: "fdt_test_tree_one_memory_range_dtb",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["tests/data/test_tree_one_memory_range.dts"],
out: ["data/test_tree_one_memory_range.dtb"],
}
genrule {
name: "fdt_test_tree_multiple_memory_ranges_dtb",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["tests/data/test_tree_multiple_memory_ranges.dts"],
out: ["data/test_tree_multiple_memory_ranges.dtb"],
}
genrule {
name: "fdt_test_tree_empty_memory_range_dtb",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["tests/data/test_tree_empty_memory_range.dts"],
out: ["data/test_tree_empty_memory_range.dtb"],
}
genrule {
name: "fdt_test_tree_no_memory_node_dtb",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["tests/data/test_tree_no_memory_node.dts"],
out: ["data/test_tree_no_memory_node.dtb"],
}
diff --git a/tests/pvmfw/Android.bp b/tests/pvmfw/Android.bp
index 474c62e..c12f67a 100644
--- a/tests/pvmfw/Android.bp
+++ b/tests/pvmfw/Android.bp
@@ -2,36 +2,30 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-genrule_defaults {
- name: "test_avf_dts_to_dtb",
- tools: ["dtc"],
- cmd: "$(location dtc) -I dts -O dtb $(in) -o $(out)",
-}
-
genrule {
name: "test_avf_debug_policy_with_ramdump",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["assets/avf_debug_policy_with_ramdump.dts"],
out: ["avf_debug_policy_with_ramdump.dtbo"],
}
genrule {
name: "test_avf_debug_policy_without_ramdump",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["assets/avf_debug_policy_without_ramdump.dts"],
out: ["avf_debug_policy_without_ramdump.dtbo"],
}
genrule {
name: "test_avf_debug_policy_with_adb",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["assets/avf_debug_policy_with_adb.dts"],
out: ["avf_debug_policy_with_adb.dtbo"],
}
genrule {
name: "test_avf_debug_policy_without_adb",
- defaults: ["test_avf_dts_to_dtb"],
+ defaults: ["dts_to_dtb"],
srcs: ["assets/avf_debug_policy_without_adb.dts"],
out: ["avf_debug_policy_without_adb.dtbo"],
}