Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32762620 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I62db2bc4,I20f13fd3 into main am: cb17d910 

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



Change-Id: Ia1256c2324195747d4bd2fdbfb343b004f8e11f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e13b89a cb17d910

libs/nativewindow/rust/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -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 {

libs/nativewindow/rust/src/lib.rs

+2 −1
Original line number Diff line number Diff line
@@ -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};