diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-09-27 23:11:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-27 23:11:31 +0000 |
| commit | 28c3c33391efeaf2d19f2d9db7eb49de34a44a59 (patch) | |
| tree | 884d2c7f7bc624572f85a5be3ec91f015f1ec972 | |
| parent | 991947efccc5d6d6de9c21a9548a0ff143e51e84 (diff) | |
| parent | 82336df0c11445ba7ce6228bb4983a914328c710 (diff) | |
| download | android_development-28c3c33391efeaf2d19f2d9db7eb49de34a44a59.tar.gz android_development-28c3c33391efeaf2d19f2d9db7eb49de34a44a59.tar.bz2 android_development-28c3c33391efeaf2d19f2d9db7eb49de34a44a59.zip | |
am 82336df0: Pass in current android.jar to api-generator
* commit '82336df0c11445ba7ce6228bb4983a914328c710':
Pass in current android.jar to api-generator
| -rw-r--r-- | build/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/Android.mk b/build/Android.mk index 72ec31db7..b6445a0d7 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -126,7 +126,7 @@ $(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.2.jar +api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.3.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 \ @@ -135,11 +135,14 @@ api_gen_deps := \ api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps)) -$(HOST_OUT)/development/sdk/generated-api-versions.xml : +$(HOST_OUT)/development/sdk/generated-api-versions.xml: $(android_jar_full_target) java -cp $(api_gen_classpath) \ com.android.apigenerator.Main \ --pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \ --pattern $(TOPDIR)prebuilts/sdk/%/android.jar \ + --current-version $(PLATFORM_SDK_VERSION) \ + --current-codename $(PLATFORM_VERSION_CODENAME) \ + --current-jar $(android_jar_full_target) \ $@ |