commit 8bccd59d7a190a4a6fa288de8ac1843130e96e3e
author cushon <cushon@google.com> Thu Mar 28 17:46:31 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 28 17:47:58 2019 -0700
tree 2c3f383ce28b91bbeea52bcd79e902097969c446
parent b643b06c21b86eeec6637d9ac0733eeb8eade297

Report jar paths in singlejar one version enforcement

PiperOrigin-RevId: 240890655

src/tools/singlejar/output_jar.cc

diff --git a/src/tools/singlejar/output_jar.cc b/src/tools/singlejar/output_jar.cc
index 2e70fec..b806485 100644
--- a/src/tools/singlejar/output_jar.cc
+++ b/src/tools/singlejar/output_jar.cc
@@ -391,7 +391,7 @@
         known_members_.emplace(service_path, EntryInfo{service_handler});
       }
     } else {
-      ExtraHandler(jar_entry, &input_jar_aux_label);
+      ExtraHandler(input_jar_path, jar_entry, &input_jar_aux_label);
     }
 
     if (options_->check_desugar_deps &&
@@ -1000,4 +1000,5 @@
   return written == count;
 }
 
-void OutputJar::ExtraHandler(const CDH *, const std::string *) {}
+void OutputJar::ExtraHandler(const std::string &input_jar_path, const CDH *,
+                             const std::string *) {}

src/tools/singlejar/output_jar.h

diff --git a/src/tools/singlejar/output_jar.h b/src/tools/singlejar/output_jar.h
index c3b0ec5..18ecb10 100644
--- a/src/tools/singlejar/output_jar.h
+++ b/src/tools/singlejar/output_jar.h
@@ -46,7 +46,7 @@
   // own the instance of the combiner and will delete it on self destruction.
   void ExtraCombiner(const std::string& entry_name, Combiner *combiner);
   // Additional file handler to be redefined by a subclass.
-  virtual void ExtraHandler(const CDH *entry,
+  virtual void ExtraHandler(const std::string &input_jar_path, const CDH *entry,
                             const std::string *input_jar_aux_label);
   // Return jar path.
   const char *path() const { return options_->output_jar.c_str(); }

src/tools/singlejar/output_jar_simple_test.cc

diff --git a/src/tools/singlejar/output_jar_simple_test.cc b/src/tools/singlejar/output_jar_simple_test.cc
index 2355a55..2384063 100644
--- a/src/tools/singlejar/output_jar_simple_test.cc
+++ b/src/tools/singlejar/output_jar_simple_test.cc
@@ -67,7 +67,7 @@
 class CustomOutputJar : public OutputJar {
  public:
   ~CustomOutputJar() override {}
-  void ExtraHandler(const CDH *cdh,
+  void ExtraHandler(const std::string & /*input_jar_path*/, const CDH *cdh,
                     const std::string *input_jar_aux_label) override {
     auto file_name = cdh->file_name();
     auto file_name_length = cdh->file_name_length();