Removed asm build references, now that it is replaced by procyon.

Change on 2017/11/21 by tball <tball@google.com> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=176576114
aakilladhani · Nov 22, 2017 · 034f608 · 034f608
1 parent e5d4c83
commit 034f608
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 100 deletions.
diff --git a/cycle_finder/Makefile b/cycle_finder/Makefile
@@ -50,7 +50,7 @@ RESOURCES = \
     com/google/devtools/j2objc/reserved_names.txt
 
 DIST_DEPS = $(JSR305_JAR) j2objc_annotations.jar
-INTERNAL_DEPS = $(GUAVA_JAR) $(ASM_JAR) $(JAVAC_JAR) $(PROCYON_JARS)
+INTERNAL_DEPS = $(GUAVA_JAR) $(JAVAC_JAR) $(PROCYON_JARS)
 JAR_DEPS_DIST = $(DIST_DEPS:%=$(DIST_JAR_DIR)/%) $(INTERNAL_DEPS:%=$(JAVA_DEPS_JAR_DIR)/%)
 JAR_DEPS_PATH = $(subst $(eval) ,:,$(strip $(JAR_DEPS_DIST)))
 JUNIT_JAR_DIST = $(DIST_JAR_DIR)/$(JUNIT_JAR)

diff --git a/cycle_finder/jarjar.rules b/cycle_finder/jarjar.rules
@@ -1,2 +1 @@
 rule com.google.common.** j2objc.@0
-rule org.osgi.** j2objc.@0
diff --git a/java_deps/Makefile b/java_deps/Makefile
@@ -31,7 +31,6 @@ INTERNAL_JARS = \
   $(JSR305_SOURCE_JAR) $(JAVAX_INJECT_SOURCE_JAR) \
   $(MOCKITO_SOURCE_JAR) \
   $(JARJAR_JAR) \
-  $(ASM_JAR) \
   $(JAVAC_JAR) \
   $(PROTOBUF_JAR) \
   $(PROCYON_JARS)

diff --git a/java_deps/jarjar/asm5.patch b/java_deps/jarjar/asm5.patch
diff --git a/java_deps/jars.mk b/java_deps/jars.mk
@@ -32,8 +32,6 @@ MOCKITO_SOURCE_JAR = mockito-core-1.9.5-sources.jar
 
 PROTOBUF_JAR = protobuf-java-3.3.0.jar
 
-ASM_JAR = asm-all-5.1.jar
-
 GUAVA_JAR = guava-19.0.jar
 GUAVA_SOURCE_JAR = guava-19.0-sources.jar
 

diff --git a/java_deps/pom.xml b/java_deps/pom.xml
@@ -134,11 +134,6 @@
       <artifactId>jsilver</artifactId>
       <version>1.0.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-all</artifactId>
-      <version>5.1</version>
-    </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>

diff --git a/translator/.classpath b/translator/.classpath
@@ -8,7 +8,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/J2ObjC annotations"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/j2objc_junit.jar"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/jsr305.jar"/>
-	<classpathentry kind="lib" path="../java_deps/build_result/asm-all-5.1.jar"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/guava-19.0.jar"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/javac.jar"/>
 	<classpathentry kind="lib" path="../java_deps/build_result/procyon-decompiler.jar"/>

diff --git a/translator/Makefile b/translator/Makefile
@@ -35,7 +35,7 @@ SOURCEPATH = $(CWD):$(JAVA_SOURCE_DIR)
 BASE_PACKAGE = com/google/devtools/j2objc
 
 DIST_DEPS = $(JSR305_JAR) j2objc_annotations.jar
-INTERNAL_DEPS = $(GUAVA_JAR) $(ASM_JAR) $(JSR305_JAR) $(JAVAC_JAR) $(PROCYON_JARS)
+INTERNAL_DEPS = $(GUAVA_JAR) $(JSR305_JAR) $(JAVAC_JAR) $(PROCYON_JARS)
 JAR_DEPS_DIST = $(DIST_DEPS:%=$(DIST_JAR_DIR)/%) $(INTERNAL_DEPS:%=$(JAVA_DEPS_JAR_DIR)/%)
 JAR_DEPS_PATH = $(subst $(eval) ,:,$(strip $(JAR_DEPS_DIST)))
 JUNIT_JAR_DIST = $(DIST_JAR_DIR)/$(JUNIT_JAR)

diff --git a/translator/jarjar.rules b/translator/jarjar.rules
@@ -1,2 +1 @@
 rule com.google.common.** j2objc.@0
-rule org.osgi.** j2objc.@0
diff --git a/tree_shaker/Makefile b/tree_shaker/Makefile
@@ -45,7 +45,7 @@ RESOURCES = \
     com/google/devtools/j2objc/JRE.mappings
 
 DIST_DEPS = $(JSR305_JAR) j2objc_annotations.jar
-INTERNAL_DEPS = $(GUAVA_JAR) $(ASM_JAR) $(JAVAC_JAR) $(PROCYON_JARS)
+INTERNAL_DEPS = $(GUAVA_JAR) $(JAVAC_JAR) $(PROCYON_JARS)
 JAR_DEPS_DIST = $(DIST_DEPS:%=$(DIST_JAR_DIR)/%) $(INTERNAL_DEPS:%=$(JAVA_DEPS_JAR_DIR)/%)
 JAR_DEPS_PATH = $(subst $(eval) ,:,$(strip $(JAR_DEPS_DIST)))
 JUNIT_JAR_DIST = $(DIST_JAR_DIR)/$(JUNIT_JAR)

diff --git a/tree_shaker/jarjar.rules b/tree_shaker/jarjar.rules
@@ -1,2 +1 @@
 rule com.google.common.** j2objc.@0
-rule org.osgi.** j2objc.@0
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		rule com.google.common.** j2objc.@0
		rule org.osgi.** j2objc.@0