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

Commit 5e36438a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ic4db008a,I3c41d85d into main 

* changes:
  system/gd: Remove sources for unimplemented module AttModule
  system: Remove unused soong declarations
parents d7474b80 e76084a8

system/Android.bp

+0 −36
Original line number Diff line number Diff line
@@ -145,24 +145,6 @@ genrule { 
    out: ["blueberry_facade_generated_py.zip"],

}



rust_protobuf {

    name: "libbt_facade_proto",

    crate_name: "bt_facade_proto",

    protos: ["blueberry/facade/common.proto"],

    grpc_protos: [

        "blueberry/facade/hal/hal_facade.proto",

        "blueberry/facade/hci/controller_facade.proto",

        "blueberry/facade/hci/hci_facade.proto",

        "blueberry/facade/rootservice.proto",

    ],

    source_stem: "facade",

    host_supported: true,

    apex_available: [

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}



rust_protobuf {

    name: "libbt_topshim_facade_protobuf",

    crate_name: "bt_topshim_facade_protobuf",
@@ -171,24 +153,6 @@ rust_protobuf { 
    grpc_protos: ["blueberry/facade/topshim/facade.proto"],

}



genrule {

    name: "libbt_topshim_facade_py_proto",

    tools: [

        "aprotoc",

        "protoc-gen-grpc-python-plugin",

        "soong_zip",

    ],

    cmd: "$(location aprotoc) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-python-plugin) -Iexternal/protobuf/src -Ipackages/modules/Bluetooth/system $(location blueberry/facade/topshim/facade.proto) --grpc_out=$(genDir) --python_out=$(genDir)",

    srcs: [

        ":libprotobuf-internal-protos",

        "blueberry/facade/topshim/facade.proto",

    ],

    out: [

        "blueberry/facade/topshim/facade_pb2.py",

        "blueberry/facade/topshim/facade_pb2_grpc.py",

    ],

}



// Export system headers for rules that can't simply use `include_dirs`

cc_library_headers {

    name: "libbluetooth_system_headers",

system/gd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ cc_defaults { 
        },

    },

    srcs: [

        ":BluetoothAttSources",

        ":BluetoothCommonSources",

        ":BluetoothDumpsysSources",

        ":BluetoothHalSources",

system/gd/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ static_library("libbluetooth_gd") { 
  deps = [

    "//bt/system/gd/rust/topshim:libbluetooth_topshim",

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

    "//bt/system/gd/att:BluetoothAttSources",

    "//bt/system/gd/common:BluetoothCommonSources",

    "//bt/system/gd/dumpsys:BluetoothDumpsysSources",

    "//bt/system/gd/hal:BluetoothHalSources",

system/gd/att/Android.bp

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "system_bt_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_bt_license"],

}



filegroup {

    name: "BluetoothAttSources",

    srcs: [

        "att_module.cc",

    ],

}



filegroup {

    name: "BluetoothAttTestSources",

    srcs: [

    ],

}

system/gd/att/BUILD.gn

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#

#  Copyright 2021 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.

#



source_set("BluetoothAttSources") {

  sources = [ "att_module.cc" ]



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

  deps = [ "//bt/system/gd:gd_default_deps" ]

}