commit 32762620eae215f117966ef5622541af203143f9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Apr 05 11:41:28 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 05 11:41:28 2024 +0000
tree 71c62e1c925b11d11765ab928b09de85b19a2716
parent 5e13b89acf28d0c6076e2b1d772d7b93f38648f7
parent cb17d9103583d1c3fd5f3570e6a6b10afb9663df

Merge changes I62db2bc4,I20f13fd3 into main am: cb17d91035

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3016430

Change-Id: Ia1256c2324195747d4bd2fdbfb343b004f8e11f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/nativewindow/rust/Android.bp

diff --git a/libs/nativewindow/rust/Android.bp b/libs/nativewindow/rust/Android.bp
index 90d0a8e..798d804 100644
--- a/libs/nativewindow/rust/Android.bp
+++ b/libs/nativewindow/rust/Android.bp
@@ -53,6 +53,10 @@
     },
     min_sdk_version: "VanillaIceCream",
     vendor_available: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_library {
@@ -77,6 +81,10 @@
     },
     min_sdk_version: "VanillaIceCream",
     vendor_available: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_test {
@@ -115,6 +123,10 @@
     },
     min_sdk_version: "VanillaIceCream",
     vendor_available: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_test {

libs/nativewindow/rust/src/lib.rs

diff --git a/libs/nativewindow/rust/src/lib.rs b/libs/nativewindow/rust/src/lib.rs
index 22ad834..dc3f51f 100644
--- a/libs/nativewindow/rust/src/lib.rs
+++ b/libs/nativewindow/rust/src/lib.rs
@@ -16,7 +16,8 @@
 
 extern crate nativewindow_bindgen as ffi;
 
-pub mod surface;
+mod surface;
+pub use surface::Surface;
 
 pub use ffi::{AHardwareBuffer_Format, AHardwareBuffer_UsageFlags};