diff options
| author | Anton Hansson <hansson@google.com> | 2022-05-11 08:11:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-11 08:11:45 +0000 |
| commit | 39ebb3b0c02434502e97edd7efeaafca7526b739 (patch) | |
| tree | 3d2209c353df4320ea6beeba8517256b1f1abb1e | |
| parent | c079a82c708989576a4dec6e557d14ed6eda9a26 (diff) | |
| parent | 247c5f26ec28958917e289b19b0b9870cf6d1d39 (diff) | |
| download | base-39ebb3b0c02434502e97edd7efeaafca7526b739.tar.gz | |
Merge "Use lint database from api_version_public"
| -rw-r--r-- | ApiDocs.bp | 6 | ||||
| -rw-r--r-- | api/api.go | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index 39f055b578ab..a542c5cf245c 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -134,11 +134,7 @@ droidstubs { defaults: ["android-non-updatable-doc-stubs-defaults"], srcs: [":all-modules-public-stubs-source"], args: metalava_framework_docs_args, - api_levels_annotations_enabled: true, - api_levels_annotations_dirs: [ - "sdk-dir", - "api-versions-jars-dir", - ], + api_levels_module: "api_versions_public", aidl: { include_dirs: [ "packages/modules/Connectivity/framework/aidl-export", 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) } |