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

Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c am: 247163d8fa am: 6f027103d2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: I151e9b08f84fa97a362dc86461cc3a490391a400
This commit is contained in:
Anton Hansson
2021-10-18 10:53:24 +00:00
committed by Automerger Merge Worker
parent 05ec491fef 6f027103d2
commit 1718ea4476
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/Android.mk
View File

@@ -106,7 +106,8 @@ ALL_SDK_FILES += $(full_target)
$(call dist-for-goals,sdk win_sdk,$(full_target):data/api-versions.xml)
# ======= Lint Annotations zip ===========
full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/sdk-annotations.zip
$(eval $(call copy-one-file,$(call intermediates-dir-for,ETC,sdk-annotations.zip)/sdk-annotations.zip,$(full_target)))
ALL_SDK_FILES += $(full_target)
$(call dist-for-goals,sdk win_sdk,$(full_target):data/annotations.zip)

2
build/sdk.atree
View File

@@ -95,7 +95,7 @@ ${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_generated-api-version
# API annotations database for lint
prebuilts/sdk/sdk-annotations/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
${OUT_DIR}/target/common/obj/PACKAGING/sdk-annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip
# Eclipse Editors support
frameworks/base/core/res/res platforms/${PLATFORM_NAME}/data/res