Refactor various options into a struct

There should be no functional change.

Bug: 198212494
Test: atest DeriveClasspathTest
Test: device still boot

Change-Id: Ic17052de30f71a0243d0f7280212b654729950ea

1 files changed, 9 insertions, 4 deletions

diff --git a/derive_classpath/main.cpp b/derive_classpath/main.cpp
index b896eb9..d589680 100644
--- a/derive_classpath/main.cpp
+++ b/derive_classpath/main.cpp
@@ -15,22 +15,27 @@
  */
 
 #include <android-base/logging.h>
+#include <android-base/strings.h>
 #include <cstdlib>
 #include <string_view>
 
 #include "derive_classpath.h"
 
 int main(int argc, char** argv) {
-  std::string_view output_location;
+  // Default args
+  android::derive_classpath::Args args = {
+      .output_path = android::derive_classpath::kGeneratedClasspathExportsFilepath,
+      .glob_pattern_prefix = "",
+  };
   if (argc == 1) {
-    output_location = android::derive_classpath::kGeneratedClasspathExportsFilepath;
+    args.output_path = android::derive_classpath::kGeneratedClasspathExportsFilepath;
   } else if (argc == 2) {
-    output_location = argv[1];
+    args.output_path = argv[1];
   } else {
     LOG(ERROR) << "too many arguments " << argc;
     return EXIT_FAILURE;
   }
-  if (!android::derive_classpath::GenerateClasspathExports(output_location)) {
+  if (!android::derive_classpath::GenerateClasspathExports(args)) {
     return EXIT_FAILURE;
   }
   return EXIT_SUCCESS;