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

Merge "Move to framework-doc-stubs module for versions xml and annotations"

Browse Source
This commit is contained in:
Treehugger Robot
2020-03-13 02:13:59 +00:00
committed by Gerrit Code Review
parent 834c8442cb 1a6d508576
commit 73870d9f09
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/Android.mk
View File

@@ -109,7 +109,10 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-s
ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
# ======= Lint API XML ===========
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api-stubs-docs_generated-api-versions.xml
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml
# ======= Lint Annotations zip ===========
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
# ============ SDK AIDL ============
$(eval $(call copy-one-file,$(FRAMEWORK_AIDL),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl))

8
build/sdk.atree
View File

@@ -62,8 +62,8 @@ 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
${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
${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_generated-api-versions.xml platform-tools/api/api-versions.xml
${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_annotations.zip platform-tools/api/annotations.zip
##############################################################################
# Build Tools Component
@@ -205,11 +205,11 @@ 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
${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml
${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_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
${OUT_DIR}/target/common/obj/PACKAGING/api-stubs-docs_annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip
${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip
# Eclipse Editors support
framework/layoutlib-legacy.jar platforms/${PLATFORM_NAME}/data/layoutlib.jar