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

Commit 6f74c531 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "flags: Remove floss workaround from wrapper" into main am: f996d0a5 

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



Change-Id: Ia2ee5079a8ad55e0ef702f534a85528969a8c1cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2523a408 f996d0a5

flags/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ aconfig("bluetooth_flags_c_lib") { 
    "a2dp.aconfig",

    "asha.aconfig",

    "audio_routing.aconfig",

    "avrcp.aconfig",

    "avrcp_controller.aconfig",

    "bta_dm.aconfig",

    "btif_dm.aconfig",

flags/exported_include/android_bluetooth_flags.h

+0 −14
Original line number Diff line number Diff line
@@ -16,21 +16,7 @@ 


#pragma once



#ifndef TARGET_FLOSS



#include <com_android_bluetooth_flags.h>



#define IS_FLAG_ENABLED(flag_name) com::android::bluetooth::flags::flag_name()

#define IS_FLAG_ENABLED_P(provider, flag_name) provider.flag_name()
 


#else



// FLOSS does not yet support android aconfig flags

#define IS_FLAG_ENABLED(flag_name) false

#define IS_FLAG_ENABLED_P(provider, flag_name) false



namespace com::android::bluetooth::flags {

struct flag_provider_interface {};

}  // namespace com::android::bluetooth::flags



#endif

system/audio_hal_interface/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ static_library("audio_hal_interface") { 
  ]



  deps = [

    "//bt/flags:bluetooth_flags_c_lib",

    "//bt/system/common",

    "//bt/system/osi:osi",

  ]

system/bta/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static_library("bta") { 
  ]



  deps = [

    "//bt/flags:bluetooth_flags_c_lib",

    "//bt/system/audio:libbt-audio-asrc",

    "//bt/system/bta:LeAudioSetScenariosSchema_bfbs",

    "//bt/system/bta:LeAudioSetConfigsSchema_bfbs",

system/btif/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static_library("btif") { 
  ]



  deps = [

    "//bt/flags:bluetooth_flags_c_lib",

    "//bt/system:libbt-platform-protos-lite",

    "//bt/system/common",

    "//bt/system/gd/rust/shim:init_flags_bridge_header",