Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use lint database from api_version_public" am: 39ebb3b0c0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092243

Change-Id: Id40b4f020f8f7da01beac428f3ad955cb6fc3a72
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 7d4b80089c 39ebb3b0c0
commit d708548986
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApiDocs.bp
View File

@@ -134,11 +134,7 @@ droidstubs {
defaults: ["android-non-updatable-doc-stubs-defaults"], defaults: ["android-non-updatable-doc-stubs-defaults"],
srcs: [":all-modules-public-stubs-source"], srcs: [":all-modules-public-stubs-source"],
args: metalava_framework_docs_args, args: metalava_framework_docs_args,
api_levels_annotations_enabled: true, api_levels_module: "api_versions_public",
api_levels_annotations_dirs: [
"sdk-dir",
"api-versions-jars-dir",
],
aidl: { aidl: {
include_dirs: [ include_dirs: [
"packages/modules/Connectivity/framework/aidl-export", "packages/modules/Connectivity/framework/aidl-export",

2
api/api.go
View File

@@ -179,7 +179,7 @@ func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) {
// Note: order matters: first parameter is the full api-versions.xml // Note: order matters: first parameter is the full api-versions.xml
// after that the stubs files in any order // after that the stubs files in any order
// stubs files are all modules that export API surfaces EXCEPT ART // 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"}}} props.Dists = []android.Dist{{Targets: []string{"sdk"}}}
ctx.CreateModule(genrule.GenRuleFactory, &props) ctx.CreateModule(genrule.GenRuleFactory, &props)
} }