Commit 40837253 authored by Byoungkwon Ko's avatar Byoungkwon Ko Committed by Commit Bot

[bluetooth] Renamed global variables in device/bluetooth

In jumbo build experiments, files get merged and variables and
functions with the same name may end up in the same namespace/scope
and conflict. This happens for g_singleton in :
bluetooth_adapter_factory.cc
bluetooth_adapter_factory_wrapper.cc

[1] https://chromium.googlesource.com/chromium/src/+/lkgr/docs/jumbo.md

Bug: 887254
Change-Id: I97ff48a6aae71be0b935db1f7623da7ef65bac97
Reviewed-on: https://chromium-review.googlesource.com/c/1325109Reviewed-by: default avatarGiovanni Ortuño Urquidi <ortuno@chromium.org>
Commit-Queue: Byoungkwon Ko <codeimpl@gmail.com>
Cr-Commit-Position: refs/heads/master@{#609940}
parent 6fef99ec
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
namespace { namespace {
static base::LazyInstance<device::BluetoothAdapterFactoryWrapper>::Leaky static base::LazyInstance<device::BluetoothAdapterFactoryWrapper>::Leaky
g_singleton = LAZY_INSTANCE_INITIALIZER; g_bluetooth_adapter_factory_wrapper_singleton = LAZY_INSTANCE_INITIALIZER;
} // namespace } // namespace
...@@ -32,7 +32,7 @@ BluetoothAdapterFactoryWrapper::~BluetoothAdapterFactoryWrapper() { ...@@ -32,7 +32,7 @@ BluetoothAdapterFactoryWrapper::~BluetoothAdapterFactoryWrapper() {
// static // static
BluetoothAdapterFactoryWrapper& BluetoothAdapterFactoryWrapper::Get() { BluetoothAdapterFactoryWrapper& BluetoothAdapterFactoryWrapper::Get() {
return g_singleton.Get(); return g_bluetooth_adapter_factory_wrapper_singleton.Get();
} }
bool BluetoothAdapterFactoryWrapper::IsLowEnergySupported() { bool BluetoothAdapterFactoryWrapper::IsLowEnergySupported() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment