diff options
| author | 2024-04-05 11:16:15 +0000 | |
|---|---|---|
| committer | 2024-04-05 11:16:15 +0000 | |
| commit | cb17d9103583d1c3fd5f3570e6a6b10afb9663df (patch) | |
| tree | 71c62e1c925b11d11765ab928b09de85b19a2716 | |
| parent | 068bb7a296d46701f7c076d9234acae876eac895 (diff) | |
| parent | 30cfde3b12f25a5b4c21f880cb00c1ea779a6a59 (diff) | |
Merge changes I62db2bc4,I20f13fd3 into main
* changes:
Make libnativewindow_rs be available to the virt APEX
Export surface::Surface as Surface
| -rw-r--r-- | libs/nativewindow/rust/Android.bp | 12 | ||||
| -rw-r--r-- | libs/nativewindow/rust/src/lib.rs | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libs/nativewindow/rust/Android.bp b/libs/nativewindow/rust/Android.bp index 90d0a8e400..798d804275 100644 --- a/libs/nativewindow/rust/Android.bp +++ b/libs/nativewindow/rust/Android.bp @@ -53,6 +53,10 @@ rust_bindgen { }, min_sdk_version: "VanillaIceCream", vendor_available: true, + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_library { @@ -77,6 +81,10 @@ rust_library { }, min_sdk_version: "VanillaIceCream", vendor_available: true, + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_test { @@ -115,6 +123,10 @@ rust_library { }, min_sdk_version: "VanillaIceCream", vendor_available: true, + apex_available: [ + "//apex_available:platform", + "com.android.virt", + ], } rust_test { diff --git a/libs/nativewindow/rust/src/lib.rs b/libs/nativewindow/rust/src/lib.rs index 22ad83463c..dc3f51f7fd 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}; |