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

Commit 01785daf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "sysprop: Remove floss workaround from wrapper" into main am: 033f507d am: 4d8a3078 

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



Change-Id: I0ef8d0077e5854e571e419c885311ac7b43ac277
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bac7d0aa 4d8a3078

sysprop/BUILD.gn

0 → 100644
+13 −0
Original line number Diff line number Diff line 
import("//bt/sysprop/sysprop.gni")



sysprop("libcom.android.sysprop.bluetooth") {

  sources = [

    "a2dp.sysprop",

    "avrcp.sysprop",

    "ble.sysprop",

    "bta.sysprop",

    "device_id.sysprop",

    "hfp.sysprop",

  ]

  deps = [ "//bt/floss/android-base:android-base" ]

}

sysprop/exported_include/android_bluetooth_sysprop.h

+0 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#pragma once



#ifndef TARGET_FLOSS



#include <a2dp.sysprop.h>

#include <avrcp.sysprop.h>

#include <ble.sysprop.h>
@@ -27,9 +25,3 @@ 


#define GET_SYSPROP(namespace, prop, default) \

  android::sysprop::bluetooth::namespace ::prop().value_or(default)
 


#else



#define GET_SYSPROP(namespace, prop, default) default



#endif

sysprop/sysprop.gni

0 → 100644
+55 −0
Original line number Diff line number Diff line 
#

#  Copyright 2024 Google, Inc.

#

#  Licensed under the Apache License, Version 2.0 (the "License");

#  you may not use this file except in compliance with the License.

#  You may obtain a copy of the License at:

#

#  http://www.apache.org/licenses/LICENSE-2.0

#

#  Unless required by applicable law or agreed to in writing, software

#  distributed under the License is distributed on an "AS IS" BASIS,

#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#  See the License for the specific language governing permissions and

#  limitations under the License.

#



# Generate c++ headers for each sysprop file

#

# Parameters:

#   sources: sysprop source files

template("sysprop") {

  assert(defined(invoker.sources), "sources must be set")



  outdir = rebase_path(target_gen_dir, root_build_dir)



  action_foreach("${target_name}_sources") {

    script = "//common-mk/file_generator_wrapper.py"

    args = [

      "sysprop_cpp",

      "--header-dir=${outdir}/include",

      "--public-header-dir=${outdir}/public",

      "--source-dir=${outdir}/src",

      "--include-name={{source_file_part}}.h",

      "{{source}}",

    ]

    sources = invoker.sources

    outputs = [

      "${target_gen_dir}/include/{{source_file_part}}.h",

      "${target_gen_dir}/src/{{source_file_part}}.cpp",

      "${target_gen_dir}/public/{{source_file_part}}.h",

    ]

  }



  all_dependent_config_name = "_${target_name}_all_dependent_config"

  config(all_dependent_config_name) {

    include_dirs = [ "${target_gen_dir}/include" ]

  }



  static_library(target_name) {

    public_deps = [ ":${target_name}_sources" ]

    sources = get_target_outputs(":${target_name}_sources")

    deps = invoker.deps

    all_dependent_configs = [ ":${all_dependent_config_name}" ]

  }

}

system/bta/BUILD.gn

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


  deps = [

    "//bt/flags:bluetooth_flags_c_lib",

    "//bt/sysprop:libcom.android.sysprop.bluetooth",

    "//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/sysprop:libcom.android.sysprop.bluetooth",

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

    "//bt/system/common",

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