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

Merge "Use lint database from api_versions_public" am: 4f9305a51c

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

Change-Id: Id3b47831f9a0d1a4966b7248c7e8110d9ef902f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Hansson
2022-05-11 20:41:59 +00:00
committed by Automerger Merge Worker
parent a830ff7604 4f9305a51c
commit 0f1b793d59
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Android.mk
View File

@@ -101,7 +101,7 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.runner.stubs_intermediates/classes.jar
# ======= Lint API XML =========== # ======= Lint API XML ===========
full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/api_versions_public_generated-api-versions.xml
ALL_SDK_FILES += $(full_target) ALL_SDK_FILES += $(full_target)
$(call dist-for-goals,sdk,$(full_target):data/api-versions.xml) $(call dist-for-goals,sdk,$(full_target):data/api-versions.xml)

2
build/sdk.atree
View File

@@ -91,7 +91,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 development/tools/templates/ic_launcher_xhdpi.png platforms/${PLATFORM_NAME}/templates/ic_launcher_xhdpi.png
# API database for tools such as lint # API database for tools such as lint
${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml ${OUT_DIR}/target/common/obj/PACKAGING/api_versions_public_generated-api-versions.xml platforms/${PLATFORM_NAME}/data/api-versions.xml
# API annotations database for lint # API annotations database for lint
prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip