From 1d75c7fe3193505e5234a05bc662c43bc4985a6f Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 9 May 2022 09:55:45 +0000 Subject: [PATCH] Use lint database from api_versions_public These two databases are (nearly) identical but the latter is generated in a much more efficient way. The diffs are very minor and it's not clear to me which versions is more correct than the other, though I'm fairly confident they don't matter. https://paste.googleplex.com/5567994005553152 Bug: 187398174 Test: diff api-versions.xml Change-Id: I97375e0d72675bc8ff102551b3e3913e684be683 --- build/Android.mk | 2 +- build/sdk.atree | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index 0c12be3bb..886e81688 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -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 # ======= 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) $(call dist-for-goals,sdk,$(full_target):data/api-versions.xml) diff --git a/build/sdk.atree b/build/sdk.atree index b23b76751..48675b712 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -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 # 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 prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip