Update to api-generator 22.9.4.
The new API generator uses ASM 5.0.4 instead of 4.0, which makes
it capable of handling class files format 52. It also drops the
dependency on the SDK common jar and only depends on Guava (and
ASM), using the offline Maven repository directly.
(cherry-picked from commit 1d7a69a635f6beb4cf678a307b516e6f4447ed5a)
Change-Id: Ia8322366f4a8f7a70610d07104375f53d54aab01
diff --git a/build/Android.mk b/build/Android.mk
index f7dcb55..153ad3b 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -134,12 +134,12 @@
ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml
-api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.3.jar
+api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.4.jar
api_gen_deps := \
- $(TOPDIR)prebuilts/tools/common/kxml2-tools/kxml2-2.3.0.jar \
- $(TOPDIR)prebuilts/tools/common/asm-tools/asm-4.0.jar \
- $(TOPDIR)prebuilts/tools/common/asm-tools/asm-tree-4.0.jar \
- $(TOPDIR)prebuilts/devtools/tools/lib/common.jar
+ $(TOPDIR)prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar \
+ $(TOPDIR)prebuilts/tools/common/m2/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar \
+ $(TOPDIR)prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar \
+ $(TOPDIR)prebuilts/tools/common/m2/repository/com/google/guava/guava/17.0/guava-17.0.jar
api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps))
