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

Merge "Bundle Metalava based api-versions.xml to SDK" into stage-aosp-master

Browse Source 
am: e205e2a934

Change-Id: I97d17153730b803225e8d3efb0367a6e9f9b450a
This commit is contained in:
Nan Zhang
2018-09-18 17:54:01 -07:00
committed by android-build-merger
parent 52916149c5 e205e2a934
commit 2d44d773eb
2 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
build/Android.mk
View File

@@ -99,43 +99,8 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-s
# shrinkedAndroid.jar for multidex support
ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
# $(1): the Java library name
define _package_sdk_library
$(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/classes.jar)
$(eval _psm_packaging_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(1)_intermediates/$(1).jar)
$(_psm_packaging_target) : $(_psm_build_module)
@echo "Package $(1).jar: $$@"
$$(copy-file-to-target)
@# Delete resource generated classes from the jar files.
$(hide) zip -d $$@ "*/R.class" "*/R\$$$$*.class" "*/Manifest.class" "*/Manifest\$$$$*.class" >/dev/null 2>&1 || true
ALL_SDK_FILES += $(_psm_packaging_target)
$(eval _psm_build_module :=)
$(eval _psm_packaging_target :=)
endef
# ======= Lint API XML ===========
ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml
api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-26.3.0.jar
api_gen_deps := \
$(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))
$(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/%/public/android.jar \
--current-version $(PLATFORM_SDK_VERSION) \
--current-codename $(PLATFORM_VERSION_CODENAME) \
--current-jar $(android_jar_full_target) \
$@
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-stubs-docs_generated-api-versions.xml
# ============ System SDK ============
full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_system_stubs_current,,COMMON)/classes.jar

4
build/sdk.atree
View File

@@ -67,7 +67,7 @@ external/chromium-trace/UPSTREAM_REVISION platfo
# Compatibility: moved to platform but also leave them in platform-tools for a little
# longer until all active Gradle plugins have support for looking in both places
development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xml
${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml platform-tools/api/api-versions.xml
${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_annotations.zip platform-tools/api/annotations.zip
##############################################################################
@@ -210,7 +210,7 @@ development/tools/templates/ic_launcher_hdpi.png platforms/${PLATFORM
development/tools/templates/ic_launcher_xhdpi.png platforms/${PLATFORM_NAME}/templates/ic_launcher_xhdpi.png
# API database for tools such as lint
development/sdk/generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml
${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml
# API annotations database for lint
prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip