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

Commit 4a1aace4 authored by Michael Sun's avatar Michael Sun Committed by Automerger Merge Worker
Browse files

Merge "floss: have floss built with libstructuredmetrics" am: 98ac72fc am:... 

Merge "floss: have floss built with libstructuredmetrics" am: 98ac72fc am: da84302f am: c1674214 am: c9beb322 am: 9314da4a

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



Change-Id: Ia4c683f3ea5d2c043ea35dbe396f44d3bd032998
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 265446c3 9314da4a

BUILD.gn

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ group("all") { 
}



# Tools should be built for the host target.

if (host_cpu == target_cpu && host_os == target_os) {

if (target_os == "linux") {

  group("tools") {

    deps = [ "//bt/system:tools" ]

  }

system/BUILD.gn

+23 −5
Original line number Diff line number Diff line
@@ -103,12 +103,15 @@ config("target_defaults") { 
    "-Wno-unknown-warning-option",

    "-Wno-final-dtor-non-final-class",



    string_join("", ["-ffile-prefix-map=", rebase_path(".", "${root_build_dir}", "."), "/= "])

    string_join("",

                [

                  "-ffile-prefix-map=",

                  rebase_path(".", "${root_build_dir}", "."),

                  "/= ",

                ]),

  ]



  cflags_cc = [

    "-std=c++17",

  ]

  cflags_cc = [ "-std=c++17" ]



  defines = [

    "HAS_NO_BDROID_BUILDCFG",
@@ -117,7 +120,7 @@ config("target_defaults") { 
    "TARGET_FLOSS",

    "EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

    "FALLTHROUGH_INTENDED=[[clang::fallthrough]]",

    "BTIF_HF_FEATURES=0x00000640"

    "BTIF_HF_FEATURES=0x00000640",

  ]



  if (!(defined(use.bt_nonstandard_codecs) && use.bt_nonstandard_codecs)) {
@@ -125,6 +128,10 @@ config("target_defaults") { 
  }



  configs = [ ":external_libchrome" ]



  if (target_os == "chromeos") {

    configs += [ ":external_chromeos" ]

  }

}



group("libbt-platform-protos-lite") {
@@ -223,3 +230,14 @@ if (defined(use.bt_nonstandard_codecs) && use.bt_nonstandard_codecs) { 
    pkg_deps = [ "ldacBT-abr" ]

  }

}



# To include ChroemOS-specific libraries and build dependencies.

if (target_os == "chromeos") {

  config("external_chromeos") {

    configs = [ ":pkgpkg_libstructuredmetrics" ]

  }



  pkg_config("pkgpkg_libstructuredmetrics") {

    pkg_deps = [ "libstructuredmetrics" ]

  }

}

system/gd/rust/linux/service/build.rs

+5 −0
Original line number Diff line number Diff line
@@ -26,5 +26,10 @@ fn main() { 
    Config::new().probe("libmodp_b64").unwrap();

    Config::new().probe("tinyxml2").unwrap();



    // Include ChromeOS-specific dependencies.

    if option_env!("TARGET_OS_VARIANT").unwrap_or("None").to_string() == "chromeos" {

        Config::new().probe("libstructuredmetrics").unwrap();

    }



    println!("cargo:rerun-if-changed=build.rs");

}