Merge "Add include_dirs to all libraries" into main

aosp-mirror · Jan 31, 2025 · 25c54fc · 25c54fc
2 parents a1f3aff + 0ec10ed
commit 25c54fc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/tools/cargo_embargo/src/cargo.rs b/tools/cargo_embargo/src/cargo.rs
@@ -64,11 +64,6 @@ impl CrateType {
     pub fn is_test(self) -> bool {
         matches!(self, Self::Test | Self::TestNoHarness)
     }
-
-    /// Returns whether the crate type is a kind of C ABI library.
-    pub fn is_c_library(self) -> bool {
-        matches!(self, Self::CDyLib | Self::StaticLib)
-    }
 }
 
 /// Info extracted from `CargoOut` for a crate.

diff --git a/tools/cargo_embargo/src/main.rs b/tools/cargo_embargo/src/main.rs
@@ -1114,7 +1114,7 @@ fn crate_to_bp_modules(
         if !crate_type.is_test() && package_cfg.host_supported && package_cfg.host_first_multilib {
             m.props.set("compile_multilib", "first");
         }
-        if crate_type.is_c_library() {
+        if crate_type.is_library() {
             m.props.set_if_nonempty("include_dirs", package_cfg.exported_c_header_dir.clone());
         }