Minor touchups to conditional compilation

Signed-off-by: Jonathan Schwender <[email protected]>
openharmony-rs · Jan 4, 2025 · 600880e · 600880e
1 parent c111697
commit 600880e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/components/drawing/src/text_typography/text_typography_ffi.rs b/components/drawing/src/text_typography/text_typography_ffi.rs
@@ -8,6 +8,7 @@ use crate::types::*;
 #[allow(unused_imports)]
 #[cfg(feature = "api-12")]
 use crate::error_code::OH_Drawing_ErrorCode;
+#[cfg(feature = "api-12")]
 use crate::font::OH_Drawing_Font_Metrics;
 use crate::text_declaration::*;
 

diff --git a/scripts/generator/src/main.rs b/scripts/generator/src/main.rs
@@ -371,6 +371,7 @@ fn get_bindings_config(api_version: u32) -> Vec<BindingConf> {
                     })
                     .raw_line("use super::native_image_ffi::*;")
                     .raw_line("use crate::native_window::OHNativeWindow;")
+                    .raw_line("#[cfg(feature = \"api-12\")]")
                     .raw_line("use crate::native_window::OHNativeWindowBuffer;")
                     .allowlist_recursively(false)
                     .allowlist_function(".*NativeWindow.*")
@@ -642,6 +643,7 @@ fn get_module_bindings_config(api_version: u32) -> Vec<DirBindingsConf> {
                          "text_typography" => {
                              builder
                                  .raw_line("use crate::text_declaration::*;")
+                                 .raw_line("#[cfg(feature = \"api-12\")]")
                                  .raw_line("use crate::font::OH_Drawing_Font_Metrics;")
                                  // FIXME: This needs to be guarded behind API-level-12 (fixed in SDK-13)
                                  // We blocklist for now and remove when updating to SDK-13

diff --git a/src/native_buffer.rs b/src/native_buffer.rs
@@ -17,9 +17,9 @@ extern "C" {}
 mod native_buffer_ffi;
 pub use native_buffer_ffi::*;
 
-#[cfg(feature = "native_window")]
-#[cfg_attr(docsrs, doc(cfg(feature = "native_window")))]
+#[cfg(all(feature = "native_window", feature = "api-12"))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "native_window", feature = "api-12"))))]
 mod native_buffer_window_ffi;
-#[cfg(feature = "native_window")]
-#[cfg_attr(docsrs, doc(cfg(feature = "native_window")))]
+#[cfg(all(feature = "native_window", feature = "api-12"))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "native_window", feature = "api-12"))))]
 pub use native_buffer_window_ffi::*;
diff --git a/src/native_image/native_image_window_ffi.rs b/src/native_image/native_image_window_ffi.rs
@@ -5,6 +5,7 @@
 #![allow(non_snake_case)]
 use super::native_image_ffi::*;
 use crate::native_window::OHNativeWindow;
+#[cfg(feature = "api-12")]
 use crate::native_window::OHNativeWindowBuffer;
 
 extern "C" {