From 247c5f26ec28958917e289b19b0b9870cf6d1d39 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 9 May 2022 09:53:12 +0000 Subject: Use lint database from api_version_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 Droidstubs now support using the api-versions.xml from another droidstubs module, so reuse the one from api_versions_public in framework-doc-stubs. Bug: 187398174 Test: diff api-versions.xml Test: diff stubs of framework-doc-stubs Change-Id: I774be9097e97d6b180fe54d799c94515780be6ec --- api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/api.go') diff --git a/api/api.go b/api/api.go index 9cd0132e2c6c..93f1354ce9e4 100644 --- a/api/api.go +++ b/api/api.go @@ -179,7 +179,7 @@ func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) { // Note: order matters: first parameter is the full api-versions.xml // after that the stubs files in any order // stubs files are all modules that export API surfaces EXCEPT ART - props.Srcs = append([]string{":framework-doc-stubs{.api_versions.xml}"}, createSrcs(modules, ".stubs{.jar}")...) + props.Srcs = append([]string{":api_versions_public{.api_versions.xml}"}, createSrcs(modules, ".stubs{.jar}")...) props.Dists = []android.Dist{{Targets: []string{"sdk"}}} ctx.CreateModule(genrule.GenRuleFactory, &props) } -- cgit v1.2.3-59-g8ed1b