From 1d7a69a635f6beb4cf678a307b516e6f4447ed5a Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Tue, 2 Feb 2016 19:49:24 -0800 Subject: [PATCH] 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. Change-Id: I2978d514fe7653465200612943593e10662327c9 --- build/Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index 4b41b8c36..f6debb24a 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -134,12 +134,12 @@ $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library, 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))