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

Commit 191788d9 authored by Bob Wang's avatar Bob Wang Committed by Automerger Merge Worker
Browse files

Merge "Add apex_available and min_sdk_version." am: 34b427ad 

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

Change-Id: I3ad0ded9c6235ea7d450edce3a78643db286fef4
parents dc9d27af 34b427ad

libs/binder/rust/Android.bp

+33 −14
Original line number Diff line number Diff line
@@ -24,13 +24,15 @@ rust_library { 
    target: {

        darwin: {

            enabled: false,

        }

        },

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",

    ],

    min_sdk_version: "current",

}



rust_library {
@@ -45,7 +47,7 @@ rust_library { 
    target: {

        darwin: {

            enabled: false,

        }

        },

    },

    apex_available: [

        "//apex_available:platform",
@@ -69,13 +71,15 @@ rust_library { 
    target: {

        darwin: {

            enabled: false,

        }

        },

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",

    ],

    min_sdk_version: "current",

    lints: "none",

    clippy_lints: "none",

}
@@ -88,20 +92,31 @@ rust_bindgen { 
    bindgen_flags: [

        // Unfortunately the only way to specify the rust_non_exhaustive enum

        // style for a type is to make it the default

        "--default-enum-style", "rust_non_exhaustive",

        "--default-enum-style",

        "rust_non_exhaustive",

        // and then specify constified enums for the enums we don't want

        // rustified

        "--constified-enum", "android::c_interface::consts::.*",

        "--constified-enum",

        "android::c_interface::consts::.*",



        "--allowlist-type", "android::c_interface::.*",

        "--allowlist-type", "AStatus",

        "--allowlist-type", "AIBinder_Class",

        "--allowlist-type", "AIBinder",

        "--allowlist-type", "AIBinder_Weak",

        "--allowlist-type", "AIBinder_DeathRecipient",

        "--allowlist-type", "AParcel",

        "--allowlist-type", "binder_status_t",

        "--allowlist-function", ".*",

        "--allowlist-type",

        "android::c_interface::.*",

        "--allowlist-type",

        "AStatus",

        "--allowlist-type",

        "AIBinder_Class",

        "--allowlist-type",

        "AIBinder",

        "--allowlist-type",

        "AIBinder_Weak",

        "--allowlist-type",

        "AIBinder_DeathRecipient",

        "--allowlist-type",

        "AParcel",

        "--allowlist-type",

        "binder_status_t",

        "--allowlist-function",

        ".*",

    ],

    shared_libs: [

        "libbinder_ndk",
@@ -127,8 +142,10 @@ rust_bindgen { 
    apex_available: [

        "//apex_available:platform",

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",

    ],

    min_sdk_version: "current",

}



// TODO(b/184872979): remove once the Rust API is created.
@@ -142,8 +159,10 @@ rust_bindgen { 
    ],

    apex_available: [

        "com.android.compos",

        "com.android.uwb",

        "com.android.virt",

    ],

    min_sdk_version: "current",

}



rust_test {