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

Commit b3bb22e5 authored by Myles Watson's avatar Myles Watson
Browse files

Use a single crypto_toolbox (GD) 

Bug: 301661850
Test: mma -j32
Change-Id: I3ddce69a3a112727632f78ab40a2b2432d973616
parent b29b6541

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ cc_library_shared { 
        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ cc_defaults { 
        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_rust_interop",

        "libbt-audio-hal-interface",

system/bta/Android.bp

+13 −9
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ cc_library_static { 
    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-bta-core",

        "libbt-platform-protos-lite",
@@ -265,9 +266,9 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-audio-hal-interface",
@@ -324,8 +325,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-audio-hal-interface",
@@ -368,8 +369,8 @@ cc_test { 
        "libstatssocket",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",
@@ -485,8 +486,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -533,8 +534,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -591,8 +592,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",
@@ -740,6 +741,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -841,6 +843,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",
@@ -921,8 +924,8 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-common",
@@ -1002,6 +1005,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -1131,8 +1135,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -1195,9 +1199,9 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-common",

system/bta/csis/csis_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "bta_groups.h"

#include "bta_sec_api.h"

#include "btif_storage.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "csis_types.h"

#include "gap_api.h"

#include "gatt_api.h"
@@ -44,7 +45,6 @@ 
#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_sec.h"

#include "stack/crypto_toolbox/crypto_toolbox.h"

#include "stack/gatt/gatt_int.h"

#include "stack/include/btm_ble_sec_api.h"

system/bta/csis/csis_types.h

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#include "bta_gatt_api.h"

#include "bta_groups.h"

#include "btif_storage.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "gap_api.h"

#include "gd/common/init_flags.h"

#include "gd/common/strings.h"

#include "stack/crypto_toolbox/crypto_toolbox.h"



// Uncomment to debug SIRK calculations

// #define CSIS_DEBUG