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

Commit 498c35d3 authored by Ted Bauer's avatar Ted Bauer
Browse files

Add new aconfig dependencies 

Aconfig flagging is undergoing an internal storage migration. Add the
new dependencies required for it.

Bug: 347701310
Test: m libbluetooth_gd
Flag: build.RELEASE_READ_FROM_NEW_STORAGE
Change-Id: I2c54a94ccc4141be4f2a219838b1a94cf22029d9
parent e3bb9309

system/audio_hal_interface/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,7 @@ cc_defaults { 
        "libbluetooth_headers",

        "libbluetooth_headers",

    ],

    ],

    defaults: [

    defaults: [

        "aconfig_lib_cc_shared_link.defaults",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_bluetooth_audio_ndk_static",

        "latest_android_hardware_bluetooth_audio_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

system/bta/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -304,7 +304,6 @@ cc_test { 
        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

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

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

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libbluetooth-types",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_crypto_toolbox",
@@ -771,6 +770,7 @@ cc_test { 
    name: "bluetooth_le_audio_codec_manager_test",

    name: "bluetooth_le_audio_codec_manager_test",

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    defaults: [

    defaults: [

        "aconfig_lib_cc_shared_link.defaults",

        "bluetooth_flatbuffer_bundler_defaults",

        "bluetooth_flatbuffer_bundler_defaults",

        "fluoride_defaults",

        "fluoride_defaults",

        "mts_defaults",

        "mts_defaults",
@@ -1084,6 +1084,7 @@ cc_test { 
    name: "bluetooth_test_broadcaster_state_machine",

    name: "bluetooth_test_broadcaster_state_machine",

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    defaults: [

    defaults: [

        "aconfig_lib_cc_shared_link.defaults",

        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "mts_defaults",

        "mts_defaults",

    ],

    ],
@@ -1149,6 +1150,7 @@ cc_test { 
    name: "bluetooth_test_broadcaster",

    name: "bluetooth_test_broadcaster",

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    defaults: [

    defaults: [

        "aconfig_lib_cc_shared_link.defaults",

        "bluetooth_flatbuffer_bundler_defaults",

        "bluetooth_flatbuffer_bundler_defaults",

        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "mts_defaults",

        "mts_defaults",

system/gd/Android.bp

+4 −2
Original line number Original line Diff line number Diff line
@@ -169,6 +169,9 @@ cc_defaults { 
        "libbluetooth_ras_pdl",

        "libbluetooth_ras_pdl",

        "libbluetooth_smp_pdl",

        "libbluetooth_smp_pdl",

    ],

    ],

    static_rlibs: [

        "libbt_shim_ffi",

    ],

    static_libs: [

    static_libs: [

        "libaconfig_storage_read_api_cc",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",
@@ -181,7 +184,6 @@ cc_defaults { 
        "libbt-common",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libcom.android.sysprop.bluetooth.wrapped",

        "libcom.android.sysprop.bluetooth.wrapped",

        "libosi",

        "libosi",

        "server_configurable_flags",

        "server_configurable_flags",
@@ -520,6 +522,7 @@ cc_test { 
    name: "bluetooth_test_gdx_unit",

    name: "bluetooth_test_gdx_unit",

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    defaults: [

    defaults: [

        "aconfig_lib_cc_shared_link.defaults",

        "gd_defaults",

        "gd_defaults",

        "mts_defaults",

        "mts_defaults",

    ],

    ],
@@ -548,7 +551,6 @@ cc_test { 
        "BluetoothGeneratedDumpsysTestData_h",

        "BluetoothGeneratedDumpsysTestData_h",

    ],

    ],

    static_libs: [

    static_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-dumpsys",

        "libbluetooth-dumpsys-test",

        "libbluetooth-dumpsys-test",