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

Commit f8d615c8 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Revert "Revert^2 [Invisalign] Build changes to split out libbluetooth-core" 

This reverts commit 02ddb3fe.

Reason for revert: broken build (https://android-build.googleplex.com/builds/submitted/9395755/full-eng/latest/view/logs/build_error.log)

Bug: http://b/262263387
Change-Id: I59b17187c7bda730a688717af51303a2f8d775fb
parent 02ddb3fe

android/app/Android.bp

+0 −45
Original line number Diff line number Diff line
@@ -79,51 +79,6 @@ cc_library_shared { 
    min_sdk_version: "Tiramisu",

}



cc_library {

    name: "libbluetooth-core",

    defaults: ["fluoride_basic_defaults"],

    header_libs: [

        "jni_headers",

        "libbluetooth_headers",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system/types",

    ],

    whole_static_libs: [

        "libbte",

        "libbt-bta-core",

        "libbt-common",

        "libbtdevice",

        "libbtif-core",

        "libbt-hci",

        "libbt-stack-core",

        "libbt-utils",

        "libbtcore",

        "libosi",

        "lib-bt-packets",

        "lib-bt-packets-base",



        "libbluetooth-types",

        "libc++fs",

    ],

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",

        "-Wall",

        "-Werror",

        "-Wextra",

        "-Wno-unused-parameter",

    ],

    sanitize: {

        scs: true,

    },

    apex_available: [

        "com.android.btservices",

    ],

    host_supported: true,

    min_sdk_version: "Tiramisu",

}



// Bluetooth APK



android_app {

system/audio_hal_interface/fuzzer/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ cc_defaults { 
        "liblog",

        "libosi",

        "libbtif",

        "libbtif-core",

        "libbase",

        "libutils",

        "libevent",
@@ -59,7 +58,6 @@ cc_defaults { 
        "libchrome",

        "libbtcore",

        "libbt-bta",

        "libbt-bta-core",

        "libbt-hci",

        "libbt_shim_bridge",

        "libbt_shim_ffi",
@@ -70,7 +68,6 @@ cc_defaults { 
        "libflatbuffers-cpp",

        "libhidlbase",

        "libbt-stack",

        "libbt-stack-core",

        "libg722codec",

        "libudrv-uipc",

        "libbt-common",

system/bta/Android.bp

+22 −47
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ cc_defaults { 
        "packages/modules/Bluetooth/system/gd/rust/shim",

    ],

    header_libs: ["libbluetooth_headers"],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    cflags: ["-DBUILDCFG"],

}
@@ -55,6 +52,7 @@ cc_library_static { 
    name: "libbt-bta",

    defaults: ["fluoride_bta_defaults"],

    srcs: [

        ":BtaDmSources",

        "ag/bta_ag_act.cc",

        "ag/bta_ag_api.cc",

        "ag/bta_ag_at.cc",
@@ -73,6 +71,20 @@ cc_library_static { 
        "av/bta_av_main.cc",

        "av/bta_av_ssm.cc",

        "csis/csis_client.cc",

        "gatt/bta_gattc_act.cc",

        "gatt/bta_gattc_api.cc",

        "gatt/bta_gattc_cache.cc",

        "gatt/bta_gattc_db_storage.cc",

        "gatt/bta_gattc_main.cc",

        "gatt/bta_gattc_queue.cc",

        "gatt/bta_gattc_utils.cc",

        "gatt/bta_gatts_act.cc",

        "gatt/bta_gatts_api.cc",

        "gatt/bta_gatts_main.cc",

        "gatt/bta_gatts_queue.cc",

        "gatt/bta_gatts_utils.cc",

        "gatt/database.cc",

        "gatt/database_builder.cc",

        "groups/groups.cc",

        "vc/device.cc",

        "vc/vc.cc",
@@ -117,49 +129,13 @@ cc_library_static { 
        "hd/bta_hd_act.cc",

        "hd/bta_hd_api.cc",

        "hd/bta_hd_main.cc",

        "jv/bta_jv_act.cc",

        "jv/bta_jv_api.cc",

        "jv/bta_jv_cfg.cc",

        "pan/bta_pan_act.cc",

        "pan/bta_pan_api.cc",

        "pan/bta_pan_ci.cc",

        "pan/bta_pan_main.cc",

    ],

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",

    ],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "libbt-bta-core",

    ],

    generated_headers: [

        "LeAudioSetConfigSchemas_h",

    ],

    host_supported: true,

    min_sdk_version: "Tiramisu"

}



cc_library_static {

    name: "libbt-bta-core",

    defaults: ["fluoride_bta_defaults"],

    srcs: [

        ":BtaDmSources",

        "gatt/bta_gattc_act.cc",

        "gatt/bta_gattc_api.cc",

        "gatt/bta_gattc_cache.cc",

        "gatt/bta_gattc_db_storage.cc",

        "gatt/bta_gattc_main.cc",

        "gatt/bta_gattc_queue.cc",

        "gatt/bta_gattc_utils.cc",

        "gatt/bta_gatts_act.cc",

        "gatt/bta_gatts_api.cc",

        "gatt/bta_gatts_main.cc",

        "gatt/bta_gatts_queue.cc",

        "gatt/bta_gatts_utils.cc",

        "gatt/database.cc",

        "gatt/database_builder.cc",

        "jv/bta_jv_act.cc",

        "jv/bta_jv_api.cc",

        "jv/bta_jv_cfg.cc",

        "sdp/bta_sdp.cc",

        "sdp/bta_sdp_act.cc",

        "sdp/bta_sdp_api.cc",
@@ -168,13 +144,13 @@ cc_library_static { 
        "sys/bta_sys_main.cc",

        "sys/utl.cc",

    ],

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",

    ],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

    ],

    generated_headers: [

        "LeAudioSetConfigSchemas_h",

    ],

    host_supported: true,

    min_sdk_version: "Tiramisu"

}
@@ -208,7 +184,6 @@ cc_test { 
        "crypto_toolbox_for_tests",

        "libbtcore",

        "libbt-bta",

        "libbt-bta-core",

        "libbt-audio-hal-interface",

        "libbluetooth-types",

        "libbt-protos-lite",

system/btcore/Android.bp

+1 −23
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ cc_defaults { 
    ],

    srcs: [

        "src/device_class.cc",

        "src/hal_util.cc",

        "src/module.cc",

        "src/osi_module.cc",

        "src/property.cc",
@@ -34,29 +35,6 @@ cc_defaults { 
    },

}



cc_library_static {

    name: "libbthalutils",

    defaults: ["fluoride_basic_defaults"],

    srcs: [

        "src/hal_util.cc",

    ],

    local_include_dirs: ["include"],

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/gd",

    ],

    header_libs: ["libbluetooth_headers"],

    host_supported: true,

    apex_available: [

        "com.android.btservices",

    ],

    target: {

        host_linux: {

            cflags: ["-D_GNU_SOURCE"],

        },

    },

}



cc_library_static {

    name: "libbtcore",

    visibility:[

system/btif/Android.bp

+38 −81
Original line number Diff line number Diff line
@@ -87,17 +87,19 @@ genrule { 
}



// libbtif static library for target



cc_library_static {

    name: "libbtif",

cc_defaults {

    name: "libbtif_defaults",

    defaults: ["fluoride_basic_defaults"],

    include_dirs: btifCommonIncludes,

    srcs: [

        // AVRCP Target Service

        "avrcp/avrcp_service.cc",

        // Callouts

        "co/bta_dm_co.cc",

        "co/bta_av_co.cc",

        "co/bta_hh_co.cc",

        "co/bta_pan_co.cc",

        "co/bta_gatts_co.cc",

        // HAL layer

        "src/bluetooth.cc",

        "src/bluetooth_data_migration.cc",
@@ -106,72 +108,8 @@ cc_library_static { 
        "src/btif_a2dp_control.cc",

        "src/btif_a2dp_sink.cc",

        "src/btif_a2dp_source.cc",

        "src/btif_av.cc",

        "src/btif_csis_client.cc",

        "src/btif_vc.cc",

        "src/btif_has_client.cc",

        "src/btif_hearing_aid.cc",

        "src/btif_hf.cc",

        "src/btif_hf_client.cc",

        "src/btif_hh.cc",

        "src/btif_hd.cc",

        "src/btif_le_audio.cc",

        "src/btif_le_audio_broadcaster.cc",

        "src/btif_pan.cc",

        "src/btif_profile_queue.cc",

        "src/btif_profile_storage.cc",

        "src/btif_rc.cc",

        "src/profile_log_levels.cc",

    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    local_include_dirs: [

        "include"

    ],

    target: {

        android: {

            whole_static_libs: [

                "libPlatformProperties",

            ],

            srcs: ["src/btif_avrcp_audio_track.cc"],

        },

        host: {

            srcs: [

                     "src/btif_avrcp_audio_track_linux.cc",

                     "src/btif_leaudio_hal_version_host.cc",

                  ],

        },

    },

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "lib-bt-packets-base",

        "lib-bt-packets-avrcp",

        "libbt-audio-hal-interface",

        "libbt-stack",

        "libbt-stack-core",

        "libbtif-core",

        "libaudio-a2dp-hw-utils",

    ],

    cflags: [

        "-DBUILDCFG",

    ],

    host_supported: true,

    min_sdk_version: "Tiramisu"

}



cc_library_static {

    name: "libbtif-core",

    defaults: ["fluoride_basic_defaults"],

    include_dirs: btifCommonIncludes,

    srcs: [

        // Callouts

        "co/bta_dm_co.cc",

        "co/bta_gatts_co.cc",

        // BTIF implementation

        "src/btif_activity_attribution.cc",

        "src/btif_av.cc",

        "src/btif_ble_advertiser.cc",

        "src/btif_ble_scanner.cc",

        "src/btif_bqr.cc",
@@ -179,6 +117,7 @@ cc_library_static { 
        "src/btif_config_cache.cc",

        "src/btif_config_transcode.cc",

        "src/btif_core.cc",

        "src/btif_csis_client.cc",

        "src/btif_debug_conn.cc",

        "src/btif_dm.cc",

        "src/btif_gatt.cc",
@@ -186,8 +125,20 @@ cc_library_static { 
        "src/btif_gatt_server.cc",

        "src/btif_gatt_test.cc",

        "src/btif_gatt_util.cc",

        "src/btif_vc.cc",

        "src/btif_has_client.cc",

        "src/btif_hearing_aid.cc",

        "src/btif_hf.cc",

        "src/btif_hf_client.cc",

        "src/btif_hh.cc",

        "src/btif_hd.cc",

        "src/btif_le_audio.cc",

        "src/btif_le_audio_broadcaster.cc",

        "src/btif_metrics_logging.cc",

        "src/btif_pan.cc",

        "src/btif_profile_queue.cc",

        "src/btif_profile_storage.cc",

        "src/btif_rc.cc",

        "src/btif_sdp.cc",

        "src/btif_sdp_server.cc",

        "src/btif_sock.cc",
@@ -201,12 +152,16 @@ cc_library_static { 
        "src/btif_uid.cc",

        "src/btif_util.cc",

        "src/btif_keystore.cc",

        "src/profile_log_levels.cc",

        "src/stack_manager.cc",

    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    local_include_dirs: [

        "include"

    ],

    target: {

        android: {

            whole_static_libs: [
@@ -222,18 +177,23 @@ cc_library_static { 
        },

    },

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "lib-bt-packets-base",

        "lib-bt-packets-avrcp",

        "libbt-audio-hal-interface",

        "libbt-stack-core",

        "libbt-stack",

        "libaudio-a2dp-hw-utils",

    ],

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",

        "-DBUILDCFG",

    ],

    host_supported: true,

}



cc_library_static {

    name: "libbtif",

    defaults: ["libbtif_defaults"],

    min_sdk_version: "Tiramisu"

}
@@ -269,9 +229,6 @@ cc_test { 
        "libbluetooth-types",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

        "libbtif",

        "libbtif-core",

        "libbt-common",

        "libbtcore",

        "libbtdevice",
@@ -280,7 +237,6 @@ cc_test { 
        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt-utils",

        "libFraunhoferAAC",

        "libg722codec",
@@ -289,6 +245,7 @@ cc_test { 
        "libudrv-uipc",

   ],

    whole_static_libs: [

        "libbtif",

        "libbluetooth-dumpsys",

        "libbluetooth-for-tests",

    ],
@@ -524,6 +481,9 @@ cc_test { 
          "liblog",

          "libtinyxml2",

      ],

      whole_static_libs: [

          "libbtif",

      ],

      static_libs: [

          "android.hardware.bluetooth.a2dp@1.0",

          "avrcp-target-service",
@@ -533,9 +493,6 @@ cc_test { 
          "libbt-sbc-decoder",

          "libbt-sbc-encoder",

          "libbt-stack",

          "libbt-stack-core",

          "libbtif",

          "libbtif-core",

          "libbtdevice",

          "lib-bt-packets",

          "lib-bt-packets-avrcp",
@@ -647,6 +604,9 @@ cc_test { 
          "liblog",

          "libtinyxml2",

      ],

      whole_static_libs: [

          "libbtif",

      ],

      static_libs: [

          "android.hardware.bluetooth.a2dp@1.0",

          "avrcp-target-service",
@@ -655,10 +615,7 @@ cc_test { 
          "libbt-audio-hal-interface",

          "libbt-sbc-decoder",

          "libbt-sbc-encoder",

          "libbtif",

          "libbtif-core",

          "libbt-stack",

          "libbt-stack-core",

          "libbtdevice",

          "lib-bt-packets",

          "lib-bt-packets-avrcp",