Added Java 8-compatible version of jarjar for public build.

Change on 2016/09/28 by tball <tball@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=134588246
google · Sep 28, 2016 · 773974f · 773974f
1 parent e4fbaac
commit 773974f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/java_deps/Makefile b/java_deps/Makefile
@@ -49,6 +49,9 @@ $(BUILD_DIR)/$(JUNIT_ROOT_JAR): $(BUILD_DIR)/.maven_generate
 $(BUILD_DIR)/$(JAVAC_JAR): | $(BUILD_DIR)
 	@cp -f $(JAVA_HOME)/lib/$(JAVAC_JAR) $@
 
+$(BUILD_DIR)/$(JARJAR): | $(BUILD_DIR)
+	@cp -f internal/$(JARJAR) $@
+
 $(BUILD_DIR) $(DIST_JAR_DIR):
 	@mkdir -p $@
 

diff --git a/java_deps/internal/jarjar.jar b/java_deps/internal/jarjar.jar
diff --git a/java_deps/jars.mk b/java_deps/jars.mk
@@ -46,7 +46,7 @@ HAMCREST_SOURCE_JAR = hamcrest-core-1.3-sources.jar
 MOCKITO_JAR = mockito-core-1.9.5.jar
 MOCKITO_SOURCE_JAR = mockito-core-1.9.5-sources.jar
 
-JARJAR = jarjar-1.3.jar
+JARJAR = jarjar.jar
 JAVAC_JAR = tools.jar
 
 DOCLAVA_JAR = doclava-1.0.6.jar