Fix misc-unused-using-decl clang-tidy issues
Test: m tidy-art
Bug: 213953102
Change-Id: Id2cec6926e863d96766a1d2d5ff3b5a9fef3bb03
diff --git a/build/Android.bp b/build/Android.bp
index 098443e..434a658 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -34,6 +34,7 @@
"bugprone-macro-parentheses",
"bugprone-unused-raii", // Protect scoped things like MutexLock.
"bugprone-virtual-near-miss",
+ "misc-unused-using-decls",
"modernize-use-bool-literals",
"performance-faster-string-find",
"performance-for-range-copy",
@@ -48,7 +49,6 @@
// when all files are free of these warnings.
"android-cloexec-dup",
"bugprone-unused-return-value",
- "misc-unused-using-decls",
"modernize-use-nullptr",
"modernize-use-using", // TODO: move to art_clang_tidy_errors after b/236243696 is done
]
diff --git a/compiler/optimizing/code_generator_vector_arm64_sve.cc b/compiler/optimizing/code_generator_vector_arm64_sve.cc
index 824b6c9..2d4921f 100644
--- a/compiler/optimizing/code_generator_vector_arm64_sve.cc
+++ b/compiler/optimizing/code_generator_vector_arm64_sve.cc
@@ -27,13 +27,10 @@
namespace arm64 {
using helpers::DRegisterFrom;
-using helpers::HeapOperand;
using helpers::InputRegisterAt;
using helpers::Int64FromLocation;
using helpers::LocationFrom;
using helpers::OutputRegister;
-using helpers::QRegisterFrom;
-using helpers::StackOperandFrom;
using helpers::SveStackOperandFrom;
using helpers::VRegisterFrom;
using helpers::ZRegisterFrom;
diff --git a/libartbase/base/mem_map_windows.cc b/libartbase/base/mem_map_windows.cc
index 84e14ea..dfa75a1 100644
--- a/libartbase/base/mem_map_windows.cc
+++ b/libartbase/base/mem_map_windows.cc
@@ -31,7 +31,6 @@
namespace art {
-using android::base::MappedFile;
using android::base::StringPrintf;
static off_t allocation_granularity;
diff --git a/libartbase/base/scoped_flock.cc b/libartbase/base/scoped_flock.cc
index b16a45a..3f44e25 100644
--- a/libartbase/base/scoped_flock.cc
+++ b/libartbase/base/scoped_flock.cc
@@ -27,7 +27,7 @@
namespace art {
-using android::base::StringPrintf;
+using android::base::StringPrintf; // NOLINT - StringPrintf is actually used
/* static */ ScopedFlock LockedFile::Open(const char* filename, std::string* error_msg) {
return Open(filename, O_CREAT | O_RDWR, true, error_msg);
diff --git a/libartbase/base/utils.cc b/libartbase/base/utils.cc
index ba62f30..1c44e3f 100644
--- a/libartbase/base/utils.cc
+++ b/libartbase/base/utils.cc
@@ -64,7 +64,7 @@
namespace art {
-using android::base::ReadFileToString;
+using android::base::ReadFileToString; // NOLINT - ReadFileToString is actually used
using android::base::StringPrintf;
#if defined(__arm__)
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp
index 638f486..85cb36d 100644
--- a/libnativeloader/native_loader_test.cpp
+++ b/libnativeloader/native_loader_test.cpp
@@ -33,7 +33,7 @@
using ::testing::Eq;
using ::testing::NotNull;
using ::testing::StrEq;
-using internal::ConfigEntry;
+using internal::ConfigEntry; // NOLINT - ConfigEntry is actually used
using internal::ParseApexLibrariesConfig;
using internal::ParseConfig;
diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index ffebe0b..ac5acc0 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -46,7 +46,6 @@
using internal::ConfigEntry;
using internal::ParseConfig;
using internal::ParseApexLibrariesConfig;
-using std::literals::string_literals::operator""s;
namespace {
@@ -117,7 +116,7 @@
if (android::base::ConsumePrefix(&fn, kExtendedPublicLibrariesFilePrefix) &&
android::base::ConsumeSuffix(&fn, kExtendedPublicLibrariesFileSuffix)) {
const std::string company_name(fn);
- const std::string config_file_path = dirname + "/"s + filename;
+ const std::string config_file_path = std::string(dirname) + std::string("/") + filename;
LOG_ALWAYS_FATAL_IF(
company_name.empty(),
"Error extracting company name from public native library list file path \"%s\"",