commit c4d63280b0d968f67bd1021abd982e2e2ddf08e3
author Joachim Sauer <jsauer@google.com> Tue Mar 15 14:54:07 2016 +0000
committer Joachim Sauer <jsauer@google.com> Wed Mar 16 11:01:33 2016 +0000
tree 0be631a72ecdbb266c29354549c83f3375bf1ece
parent 41c2bca43edfc197c3c67619115b9a70d9227008

Use existing ASM 5.0 instead of bundled ASM 4.x.

This is necessary to support classes compiled with Java 8.

Bug: 27637680
(cherry picked from commit 1ab6e78b23a8cc063c29e67a1d69f487baa1f0dc)

Change-Id: I220ad646fb20984ba88400cfb66b2631fee21224

Android.mk

diff --git a/Android.mk b/Android.mk
index 19da7a4..b0837b7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    jarjar-asm \
+    asm-5.0 \
     jarjar-asm-commons \
 
 LOCAL_JAVA_LIBRARIES := \