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

Commit 35e3d872 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes I783ee684,Ic8a80f11 into main am: 527885c7 

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



Change-Id: If8e8102d84ac1d070d9ba34a8b50ba291a02cec0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 074b774a 527885c7

README.md

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ sudo apt-get install repo git-core gnupg flex bison gperf build-essential \ 
  libgl1-mesa-dev libxml2-utils xsltproc unzip liblz4-tool libssl-dev \

  libc++-dev libevent-dev \

  flatbuffers-compiler libflatbuffers1 openssl \

  libflatbuffers-dev libtinyxml2-dev \

  libflatbuffers-dev libfmt-dev libtinyxml2-dev \

  libglib2.0-dev libevent-dev libnss3-dev libdbus-1-dev \

  libprotobuf-dev ninja-build generate-ninja protobuf-compiler \

  libre2-9 debmake \

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ cc_library_shared { 
        "libbluetooth_core_rs_bridge",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_log",

        "libbt-audio-asrc",

        "libbt-audio-hal-interface",

        "libbt-bta",

build.py

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ REQUIRED_APT_PACKAGES = [ 
    'liblz4-tool',

    'libncurses5',

    'libnss3-dev',

    'libfmt-dev',

    'libprotobuf-dev',

    'libre2-9',

    'libre2-dev',

floss/build/Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ RUN apt-get update && \ 
    libdouble-conversion-dev \

    libevent-dev \

    libflatbuffers-dev \

    libfmt-dev \

    libgl1-mesa-dev \

    libglib2.0-dev \

    libgtest-dev \

system/BUILD.gn

+8 −0
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ config("external_flatbuffers") { 
  libs = [ "flatbuffers" ]

}



config("external_fmtlib") {

  configs = [ ":pkg_fmtlib" ]

}



# Package configurations to extract dependencies from env

pkg_config("pkg_gtest") {

  pkg_deps = [ "gtest" ]
@@ -203,6 +207,10 @@ pkg_config("pkg_tinyxml2") { 
  pkg_deps = [ "tinyxml2" ]

}



pkg_config("pkd_fmtlib") {

  pkg_deps = [ "fmt" ]

}



# To include ChroemOS-specific libraries and build dependencies.

if (target_os == "chromeos") {

  config("external_chromeos") {