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

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

Merge "Add libbt_packets build target without apex" am: fe25fecc am:... 

Merge "Add libbt_packets build target without apex" am: fe25fecc am: f198aa82 am: d3a75daf am: e8ec8510

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2192123



Change-Id: Ia2dc40264178793334fbfa6a1130fdf864fbb21a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f63da044 e8ec8510

system/gd/Android.bp

+18 −0
Original line number Original line Diff line number Diff line
@@ -621,6 +621,24 @@ rust_library { 
    min_sdk_version: "30",

    min_sdk_version: "30",

}

}





rust_library {

    name: "libbt_packets_nonapex",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_packets",

    srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],

    edition: "2018",

    vendor_available : true,

    host_supported: true,

    proc_macros: ["libnum_derive"],

    rustlibs: [

        "libbytes",

        "libnum_traits",

        "libthiserror",

        "liblog_rust",

    ],

    min_sdk_version: "30",

}



rust_test_host {

rust_test_host {

    name: "libbt_packets_test",

    name: "libbt_packets_test",

    defaults: [

    defaults: [

tools/rootcanal/lmp/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ rust_ffi { 
    edition: "2018",

    edition: "2018",

    proc_macros: ["libnum_derive"],

    proc_macros: ["libnum_derive"],

    rustlibs: [

    rustlibs: [

        "libbt_packets",

        "libbt_packets_nonapex",

        "libbytes",

        "libbytes",

        "libnum_bigint",

        "libnum_bigint",

        "libnum_integer",

        "libnum_integer",