diff options
author | 2025-02-26 08:55:42 -0800 | |
---|---|---|
committer | 2025-02-26 11:14:01 -0800 | |
commit | 0dcccef4fb0cadc98d8cdc857c50cb31a4abb078 (patch) | |
tree | 296ea910603a1d1d920d2bea2124a2b42a7e28ff | |
parent | 15d4ffe9104a20ff8423ba3c663c00f9ee933cda (diff) |
Remove unused Android.bp definitions
Bug: 331817295
Test: m com.android.bt
Flag: EXEMPT, dead code removal
Change-Id: I22ccd66c4cf37248facd1db07d3c2067c5172310
-rw-r--r-- | android/app/Android.bp | 35 | ||||
-rw-r--r-- | system/pdl/hci/Android.bp | 15 | ||||
-rw-r--r-- | system/pdl/security/Android.bp | 15 | ||||
-rw-r--r-- | system/test/Android.bp | 14 | ||||
-rw-r--r-- | system/test/mock/mock_main_shim_stack.cc | 45 |
5 files changed, 0 insertions, 124 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp index b7e4929cbb..de5c43ff79 100644 --- a/android/app/Android.bp +++ b/android/app/Android.bp @@ -165,41 +165,6 @@ cc_library_shared { min_sdk_version: "Tiramisu", } -cc_library { - name: "libbluetooth-core", - defaults: ["fluoride_defaults"], - header_libs: [ - "jni_headers", - "libbluetooth_headers", - ], - static_libs: [ - "lib-bt-packets", - "lib-bt-packets-base", - "libbt-bta-core", - "libbt-common", - "libbt-hci", - "libbt-stack-core", - "libbtcore", - "libbtdevice", - "libbte", - "libbtif-core", - "libosi", - - "libbluetooth-types", - ], - cflags: [ - // we export all classes, so change default visibility, - // instead of having EXPORT_SYMBOL on each class - "-fvisibility=default", - ], - sanitize: { - scs: true, - }, - apex_available: ["com.android.bt"], - host_supported: true, - min_sdk_version: "Tiramisu", -} - android_library { name: "BluetoothLib", defaults: ["bluetooth_framework_errorprone_rules"], diff --git a/system/pdl/hci/Android.bp b/system/pdl/hci/Android.bp index 832598aaff..be954a1550 100644 --- a/system/pdl/hci/Android.bp +++ b/system/pdl/hci/Android.bp @@ -49,18 +49,3 @@ cc_library_static { apex_available: ["com.android.bt"], min_sdk_version: "33", } - -// Generate the python parser+serializer backend -genrule { - name: "gd_hci_packets_python3_gen", - defaults: ["pdl_python_generator_defaults"], - cmd: "$(location :pdlc) $(in) |" + - " $(location :pdl_python_generator)" + - " --output $(out) --custom-type-location blueberry.utils.bluetooth", - srcs: [ - "hci_packets.pdl", - ], - out: [ - "hci_packets.py", - ], -} diff --git a/system/pdl/security/Android.bp b/system/pdl/security/Android.bp index fbbc2b7339..22e947ee47 100644 --- a/system/pdl/security/Android.bp +++ b/system/pdl/security/Android.bp @@ -31,18 +31,3 @@ cc_library_static { apex_available: ["com.android.bt"], min_sdk_version: "33", } - -// Generate the python parser+serializer backend -genrule { - name: "gd_smp_packets_python3_gen", - defaults: ["pdl_python_generator_defaults"], - cmd: "$(location :pdlc) $(in) |" + - " $(location :pdl_python_generator)" + - " --output $(out) --custom-type-location blueberry.utils.bluetooth", - srcs: [ - "smp_packets.pdl", - ], - out: [ - "smp_packets.py", - ], -} diff --git a/system/test/Android.bp b/system/test/Android.bp index c38b178885..c35931ea17 100644 --- a/system/test/Android.bp +++ b/system/test/Android.bp @@ -265,13 +265,6 @@ filegroup { } filegroup { - name: "TestMockStackBnep", - srcs: [ - "mock/mock_stack_bnep_*.cc", - ], -} - -filegroup { name: "TestMockStackL2cap", srcs: [ "mock/mock_stack_l2cap_*.cc", @@ -356,13 +349,6 @@ filegroup { } filegroup { - name: "TestMockMainShimStack", - srcs: [ - "mock/mock_main_shim_stack.cc", - ], -} - -filegroup { name: "TestMockMainShimLeScanning", srcs: [ "mock/mock_main_shim_le_scanning_manager.cc", diff --git a/system/test/mock/mock_main_shim_stack.cc b/system/test/mock/mock_main_shim_stack.cc deleted file mode 100644 index 03ec09a1b3..0000000000 --- a/system/test/mock/mock_main_shim_stack.cc +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2024 The Android Open Source Project - * - * 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. - */ - -#include "hci/acl_manager.h" -#include "main/shim/stack.h" - -namespace bluetooth { -namespace shim { - -namespace testing { -Acl* acl_{nullptr}; -Stack* instance_{nullptr}; -} // namespace testing - -Stack* Stack::GetInstance() { return testing::instance_; } - -void Stack::StartEverything() {} - -void Stack::StartModuleStack(const ModuleList* /* modules */, const os::Thread* /* thread */) {} - -void Stack::Start(ModuleList* /* modules */) {} - -void Stack::Stop() {} - -bool Stack::IsRunning() { return stack_thread_ != nullptr; } - -Acl* Stack::GetAcl() { return testing::acl_; } - -os::Handler* Stack::GetHandler() { return stack_handler_; } - -} // namespace shim -} // namespace bluetooth |