commit 6529b82782a76e66e33f3a4eb325c03eab27a1f1
author Jooyung Han <jooyung@google.com> Fri Jun 11 22:05:26 2021 +0900
committer Jooyung Han <jooyung@google.com> Wed Jun 16 00:01:05 2021 +0000
tree ddebd422d76b3d46d9f97e758891bb9fa2f11250
parent 805fe312b1cffd21d0fd596005dc5b271de30a56

cleanup: remove unused parameter to ImportResolver

Bug: n/a
Test: m
Change-Id: Iae43b898de102082c97e77ad65cd2b2dddb70fb5

aidl.cpp

diff --git a/aidl.cpp b/aidl.cpp
index fe4ae3f..0f685e0 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -393,8 +393,7 @@
 
   // Find files to import and parse them
   vector<string> import_paths;
-  ImportResolver import_resolver{io_delegate, input_file_name, options.ImportDirs(),
-                                 options.InputFiles()};
+  ImportResolver import_resolver{io_delegate, input_file_name, options.ImportDirs()};
   for (const auto& import : document->Imports()) {
     if (AidlTypenames::IsBuiltinTypename(import->GetNeededClass())) {
       continue;

aidl_unittest.cpp

diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index e2a37ac..c59b469 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -104,7 +104,7 @@
     args.emplace_back(path);
     Options options = Options::From(args);
     vector<string> imported_files;
-    ImportResolver import_resolver{io_delegate_, path, import_paths_, {}};
+    ImportResolver import_resolver{io_delegate_, path, import_paths_};
     AidlError actual_error = ::android::aidl::internals::load_and_validate_aidl(
         path, options, io_delegate_, &typenames_, &imported_files);
 

generate_cpp_unittest.cpp

diff --git a/generate_cpp_unittest.cpp b/generate_cpp_unittest.cpp
index ce7c18c..a1be5d8 100644
--- a/generate_cpp_unittest.cpp
+++ b/generate_cpp_unittest.cpp
@@ -47,7 +47,7 @@
     io_delegate_.SetFileContents(options_.InputFiles().at(0), file_contents_);
 
     vector<string> imported_files;
-    ImportResolver import_resolver{io_delegate_, options_.InputFiles().at(0), {"."}, {}};
+    ImportResolver import_resolver{io_delegate_, options_.InputFiles().at(0), {"."}};
     AidlError err = ::android::aidl::internals::load_and_validate_aidl(
         options_.InputFiles().front(), options_, io_delegate_, &typenames_, &imported_files);
 

import_resolver.cpp

diff --git a/import_resolver.cpp b/import_resolver.cpp
index 1bf2794..746f1a9 100644
--- a/import_resolver.cpp
+++ b/import_resolver.cpp
@@ -37,8 +37,8 @@
 namespace aidl {
 
 ImportResolver::ImportResolver(const IoDelegate& io_delegate, const string& input_file_name,
-                               const set<string>& import_paths, const vector<string>& input_files)
-    : io_delegate_(io_delegate), input_file_name_(input_file_name), input_files_(input_files) {
+                               const set<string>& import_paths)
+    : io_delegate_(io_delegate), input_file_name_(input_file_name) {
   for (string path : import_paths) {
     if (path.empty()) {
       path = ".";

import_resolver.h

diff --git a/import_resolver.h b/import_resolver.h
index e52843e..c732165 100644
--- a/import_resolver.h
+++ b/import_resolver.h
@@ -28,8 +28,7 @@
 class ImportResolver {
  public:
   ImportResolver(const IoDelegate& io_delegate, const std::string& input_file_name,
-                 const std::set<std::string>& import_paths,
-                 const std::vector<std::string>& input_files);
+                 const std::set<std::string>& import_paths);
   virtual ~ImportResolver() = default;
 
   // non-copyable, non-movable