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

Commit 54135c6c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "floss: Fix Flatbuffer build rework"

parents 8c7dde2a 54e2b7bb

system/gd/BUILD.gn

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ group("gd_default_deps") { 
  deps = [

    "//bt/gd:BluetoothGeneratedDumpsysDataSchema_h",

    "//bt/gd:BluetoothGeneratedPackets_h",

    "//bt/gd/dumpsys:BluetoothGeneratedDumpsysBundledSchema_cc",

    "//bt/gd/dumpsys:libbluetooth-dumpsys",

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

  ]

}

system/gd/dumpsys/BUILD.gn

+2 −1
Original line number Diff line number Diff line
@@ -29,9 +29,10 @@ source_set("BluetoothDumpsysSources") { 
  deps = [ "//bt/gd:gd_default_deps" ]

}



bt_flatc_bundler("BluetoothGeneratedDumpsysBundledSchema_cc") {

bt_flatc_bundler("libbluetooth-dumpsys") {

  root_name = "bluetooth.DumpsysData"

  filename = "generated_dumpsys_bundled_schema"

  namespace = "bluetooth::dumpsys"

  deps = [ "//bt/gd:BluetoothGeneratedDumpsysBinarySchema_bfbs" ]

  configs = [ "//bt/gd:gd_defaults" ]

}

system/gd/dumpsys/bundler/bundler.gni

+6 −14
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ template("bt_flatc_bundler") { 
    ]



    outputs = [

      "${target_gen_dir}/${invoker.filename}.h",

      "${target_gen_dir}/${invoker.filename}.cc",

      "${target_gen_dir}/${invoker.filename}",

    ]
@@ -158,20 +158,12 @@ template("bt_flatc_bundler") { 
    include_dirs = [ "${target_gen_dir}" ]

  }



  generated_file(target_name) {

    outputs = [ "${target_gen_dir}/${target_name}.files" ]

    output_conversion = "list lines"

    data_keys = [ "all_outputs" ]



    all_dependent_configs = [ ":${all_dependent_config_name}" ]

    if (defined(invoker.all_dependent_configs)) {

      all_dependent_configs += invoker.all_dependent_configs

    }

  source_set(target_name) {

    sources = [

      "${target_gen_dir}/${invoker.filename}.cc",

    ]



    deps = [ ":${action_name}" ]

    if (defined(invoker.deps)) {

      deps += invoker.deps

    }

    public_deps = [ ":$action_name" ]



    if (defined(invoker.configs)) {

      configs += invoker.configs

system/gd/shim/BUILD.gn

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ source_set("BluetoothShimSources") { 
  ]



  deps = [

    "//bt/gd/dumpsys:BluetoothGeneratedDumpsysBundledSchema_cc",

    "//bt/gd/dumpsys:libbluetooth-dumpsys",

    "//bt/gd/dumpsys/bundler:BluetoothGeneratedBundlerSchema_h_bfbs",

  ]