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

Commit 3d5ca6b0 authored by Devin Moore's avatar Devin Moore
Browse files

Make libbinder_rs product_available 

So it can be used in the product partition.
Required a change in cfg based on b/270718001

Test: m
Bug: 269204477
Change-Id: I5d6f334a5eb590754355876240f4a4ff5451f1c9
parent 2c540ed3

libs/binder/rust/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ rust_library { 
    ],

    host_supported: true,

    vendor_available: true,

    product_available: true,

    target: {

        darwin: {

            enabled: false,
@@ -72,6 +73,7 @@ rust_library { 
    ],

    host_supported: true,

    vendor_available: true,

    product_available: true,

    target: {

        darwin: {

            enabled: false,
@@ -129,6 +131,7 @@ rust_bindgen { 
    ],

    host_supported: true,

    vendor_available: true,

    product_available: true,



    // Currently necessary for host builds

    // TODO(b/31559095): bionic on host should define this

libs/binder/rust/src/native.rs

+4 −4
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ impl<T: Remotable> Binder<T> { 
    }



    /// Mark this binder object with local stability, which is vendor if we are

    /// building for the VNDK and system otherwise.

    #[cfg(any(vendor_ndk, android_vndk))]

    /// building for android_vendor and system otherwise.

    #[cfg(android_vendor)]

    fn mark_local_stability(&mut self) {

        unsafe {

            // Safety: Self always contains a valid `AIBinder` pointer, so
@@ -220,8 +220,8 @@ impl<T: Remotable> Binder<T> { 
    }



    /// Mark this binder object with local stability, which is vendor if we are

    /// building for the VNDK and system otherwise.

    #[cfg(not(any(vendor_ndk, android_vndk)))]

    /// building for android_vendor and system otherwise.

    #[cfg(not(android_vendor))]

    fn mark_local_stability(&mut self) {

        unsafe {

            // Safety: Self always contains a valid `AIBinder` pointer, so