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

Commit f9e8ec52 authored by Dennis Shen's avatar Dennis Shen Committed by Automerger Merge Worker
Browse files

Merge "use new aconfig storage read api instead of server_configurable_flags"... 

Merge "use new aconfig storage read api instead of server_configurable_flags" into main am: 0f823ea9 am: 022f59b2

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



Change-Id: I324a2143a59a64ea03c6e30385b8ac606f75284f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17726c2d 022f59b2

android/app/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ cc_library_shared { 
        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libFraunhoferAAC",

        "libaconfig_storage_read_api_cc",

        "libaudio-a2dp-hw-utils",

        "libbase",

        "libbluetooth",
@@ -164,6 +165,7 @@ cc_library_shared { 
        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

    ldflags: ["-Wl,--allow-multiple-definition"],

}



cc_library {

system/audio/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_library_static { 
        "libbluetooth_headers",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libchrome",

        "liblog",

        "server_configurable_flags",
@@ -67,6 +68,7 @@ cc_library_host_shared { 
        "libbluetooth_headers",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "server_configurable_flags",

    ],

    static_libs: [

system/audio_hal_interface/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ cc_test { 
        "aidl/a2dp_provider_info_unittest.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbinder_ndk",

        "libcutils",

        "libhidlbase",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ cc_defaults { 
    shared_libs: [

        "libPlatformProperties",

        "libaaudio",

        "libaconfig_storage_read_api_cc",

        "libbinder_ndk",

        "libcrypto",

        "libfmq",

system/bta/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ cc_library_static { 
    static_libs: [

        "bluetooth_flags_c_lib",

        "lib-bt-packets",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbluetooth_hci_pdl",

        "libbluetooth_log",
@@ -288,6 +289,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libcrypto",

        "libcutils",

        "libhidlbase",
@@ -302,6 +304,7 @@ cc_test { 
        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "bluetooth_flags_c_lib",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -377,6 +380,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "liblog",
@@ -422,6 +426,7 @@ cc_test { 
        "test/bta_hf_client_security_test.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libcutils",
@@ -484,6 +489,7 @@ cc_test { 
        "test/bta_rfcomm_scn_test.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libcutils",
@@ -551,6 +557,7 @@ cc_test { 
        "test/common/btm_api_mock.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "liblog",
@@ -921,6 +928,7 @@ cc_test { 
        "LeAudioSetConfigSchemas_h",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libhidlbase",
@@ -1006,6 +1014,7 @@ cc_test { 
        "test/common/mock_device_groups.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libhidlbase",
@@ -1310,6 +1319,7 @@ cc_test { 
        "test/bta_hh_test.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "liblog",
@@ -1381,6 +1391,7 @@ cc_test { 
        "test/bta_jv_test.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "liblog",