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

Commit 69555f9a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Move Dumpsys from gd to gdx am: 45adb566 

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



Change-Id: Ieeb29f3eb90734437325395ae27381cc1aa6b10c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cd4a2bc 45adb566

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ cc_library_shared { 
        "libbase",

        "libbluetooth",

        "libbluetooth-dumpsys",

        "libbluetooth-gdx",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ cc_defaults { 
        "libaudio-a2dp-hw-utils",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-gdx",

        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth_core_rs",

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ cc_test { 
        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-for-tests",

        "libbluetooth-gdx",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_crypto_toolbox",

system/gd/Android.bp

+8 −6
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ cc_defaults { 
        ":BluetoothOsSources",

        ":BluetoothPacketSources",

        ":BluetoothSecuritySources",

        ":BluetoothShimSources",

        ":BluetoothStorageSources",

        ":BluetoothSyspropsSources",

        "module.cc",
@@ -214,6 +213,7 @@ cc_library_static { 
    ],

    srcs: [

        ":BluetoothDiscoverySources",

        ":BluetoothShimSources",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -307,6 +307,7 @@ cc_binary { 
    static_libs: [

        "breakpad_client",

        "libbluetooth-dumpsys",

        "libbluetooth-gdx",

        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -415,7 +416,6 @@ cc_test { 
    srcs: [

        ":BluetoothCommonTestSources",

        ":BluetoothCryptoToolboxTestSources",

        ":BluetoothDumpsysTestSources",

        ":BluetoothHalTestSources",

        ":BluetoothHciUnitTestSources",

        ":BluetoothL2capUnitTestSources",
@@ -423,7 +423,6 @@ cc_test { 
        ":BluetoothOsTestSources",

        ":BluetoothPacketTestSources",

        ":BluetoothSecurityUnitTestSources",

        ":BluetoothShimTestSources",

        ":BluetoothStorageUnitTestSources",

        "module_unittest.cc",

        "stack_manager_unittest.cc",
@@ -435,9 +434,6 @@ cc_test { 
        "BluetoothGeneratedDumpsysTestData_h",

    ],

    static_libs: [

        "libbluetooth-dumpsys",

        "libbluetooth-dumpsys-test",

        "libbluetooth-dumpsys-unittest",

        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -486,6 +482,8 @@ cc_test { 
    host_supported: true,

    srcs: [

        ":BluetoothDiscoveryTestSources",

        ":BluetoothDumpsysTestSources",

        ":BluetoothShimTestSources",

        ":TestCommonMockFunctions",

        "module_gdx_unittest.cc",

        "module_jniloop_unittest.cc",
@@ -500,6 +498,9 @@ cc_test { 
    ],

    static_libs: [

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-dumpsys-test",

        "libbluetooth-dumpsys-unittest",

        "libbluetooth-gdx",

        "libbluetooth-types",

        "libbluetooth_gd",
@@ -515,6 +516,7 @@ cc_test { 
        "libgmock",

        "liblog",

        "libosi",

        "server_configurable_flags",

    ],

    shared_libs: [

        "libcrypto",

system/gd/rust/topshim/facade/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ rust_defaults { 
        "libFraunhoferAAC",

        "libaudio-a2dp-hw-utils",

        "libbluetooth-dumpsys",

        "libbluetooth-gdx",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_crypto_toolbox",