LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Pass in current android.jar to api-generator"

Browse Source
This commit is contained in:
Brian Carlstrom
2015-10-15 16:23:07 +00:00
committed by Gerrit Code Review
parent d7f206d2b2 28c210b844
commit 1c44520587
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/Android.mk
View File

@@ -129,7 +129,7 @@ $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,
ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml 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 := \ api_gen_deps := \
$(TOPDIR)prebuilts/tools/common/kxml2-tools/kxml2-2.3.0.jar \ $(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-4.0.jar \
@@ -138,11 +138,14 @@ api_gen_deps := \
api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(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) \ java -cp $(api_gen_classpath) \
com.android.apigenerator.Main \ com.android.apigenerator.Main \
--pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \ --pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \
--pattern $(TOPDIR)prebuilts/sdk/%/android.jar \ --pattern $(TOPDIR)prebuilts/sdk/%/android.jar \
--current-version $(PLATFORM_SDK_VERSION) \
--current-codename $(PLATFORM_VERSION_CODENAME) \
--current-jar $(android_jar_full_target) \
$@ $@