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

Commit 19b442a2 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes If96ecb1b,I8676c1cb am: a00b6497 

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



Change-Id: Ia752157d124705e3e1d46f3ec36004d79203318d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 520418cb a00b6497

android/app/Android.bp

+18 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ java_library { 


cc_library_shared {

    name: "libbluetooth_jni",

    defaults: ["fluoride_full_defaults"],

    defaults: ["fluoride_basic_defaults"],

    srcs: ["jni/**/*.cpp"],

    header_libs: [

        "jni_headers",
@@ -67,14 +67,31 @@ cc_library_shared { 
        "packages/modules/Bluetooth/system/types",

    ],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-hci",

        "libbt-stack",

        "libbt-stack-core",

        "libbtcore",

        "libbtdevice",

        "libbte",

        "libbtif",

        "libbtif-core",

        "libc++fs",

        "libchrome",

        "libevent",

        "libmodpb64",

        "libosi",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

system/btif/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ cc_library_static { 
        "src/btif_bqr.cc",

        "src/btif_config.cc",

        "src/btif_config_cache.cc",

        "src/btif_config_transcode.cc",

        "src/btif_core.cc",

        "src/btif_debug_conn.cc",

        "src/btif_dm.cc",
@@ -566,7 +565,6 @@ cc_test { 
        "libcutils",

        "libhidlbase",

        "liblog",

        "libtinyxml2",

    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",
@@ -699,7 +697,6 @@ cc_test { 
        "libcutils",

        "libhidlbase",

        "liblog",

        "libtinyxml2",

    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",

system/btif/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static_library("btif") { 
    "src/btif_csis_client.cc",

    "src/btif_config.cc",

    "src/btif_config_cache.cc",

    "src/btif_config_transcode.cc",

    "src/btif_core.cc",

    "src/btif_debug_conn.cc",

    "src/btif_dm.cc",

system/btif/include/btif_config_transcode.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2014 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.

 *

 ******************************************************************************/



#pragma once



#include "osi/include/config.h"



std::unique_ptr<config_t> btif_config_transcode(const char* xml_filename);

system/btif/src/btif_config.cc

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "btif_api.h"

#include "btif_common.h"

#include "btif_config_cache.h"

#include "btif_config_transcode.h"

#include "btif_keystore.h"

#include "btif_metrics_logging.h"

#include "common/address_obfuscator.h"