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

Merge "Remove filegroups for *current.txt files" am: 2a8f6d0027 am: f9a5e2a76e am: 059abfa49c am: 3611a8d3a1

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

Change-Id: I7aeba7aa3f882a5b274d5e8969119640f98509b3
This commit is contained in:
Anton Hansson
2020-11-03 10:59:41 +00:00
committed by Automerger Merge Worker
parent 8c20d86f91 3611a8d3a1
commit 4a48531a62
1 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
api/Android.bp
View File

@@ -16,25 +16,6 @@ package {
default_visibility: ["//visibility:private"],
}
// *-current.txt files for use by modules in other directories like cts
filegroup {
name: "frameworks-base-api-current.txt",
srcs: ["current.txt"],
visibility: ["//visibility:public"],
}
filegroup {
name: "frameworks-base-api-system-current.txt",
srcs: ["system-current.txt"],
visibility: ["//visibility:public"],
}
filegroup {
name: "frameworks-base-api-system-removed.txt",
srcs: ["system-removed.txt"],
visibility: ["//visibility:public"],
}
genrule {
name: "current-api-xml",
tools: ["metalava"],
@@ -45,7 +26,7 @@ genrule {
}
genrule {
name: "frameworks-base-api-current-merged.txt",
name: "frameworks-base-api-current.txt",
srcs: [
":conscrypt.module.public.api{.public.api.txt}",
":framework-appsearch{.public.api.txt}",
@@ -74,10 +55,11 @@ genrule {
dest: "android.txt",
},
],
visibility: ["//visibility:public"],
}
genrule {
name: "frameworks-base-api-removed-merged.txt",
name: "frameworks-base-api-removed.txt",
srcs: [
":conscrypt.module.public.api{.public.removed-api.txt}",
":framework-appsearch{.public.removed-api.txt}",
@@ -104,7 +86,7 @@ genrule {
}
genrule {
name: "frameworks-base-api-system-current-merged.txt",
name: "frameworks-base-api-system-current.txt",
srcs: [
":framework-appsearch{.system.api.txt}",
":framework-graphics{.system.api.txt}",
@@ -132,10 +114,11 @@ genrule {
dest: "android.txt",
},
],
visibility: ["//visibility:public"],
}
genrule {
name: "frameworks-base-api-system-removed-merged.txt",
name: "frameworks-base-api-system-removed.txt",
srcs: [
":framework-appsearch{.system.removed-api.txt}",
":framework-graphics{.system.removed-api.txt}",
@@ -158,10 +141,11 @@ genrule {
dest: "system-removed.txt",
},
],
visibility: ["//visibility:public"],
}
genrule {
name: "frameworks-base-api-module-lib-current-merged.txt",
name: "frameworks-base-api-module-lib-current.txt",
srcs: [
":framework-appsearch{.module-lib.api.txt}",
":framework-graphics{.module-lib.api.txt}",
@@ -192,7 +176,7 @@ genrule {
}
genrule {
name: "frameworks-base-api-module-lib-removed-merged.txt",
name: "frameworks-base-api-module-lib-removed.txt",
srcs: [
":framework-appsearch{.module-lib.removed-api.txt}",
":framework-graphics{.module-lib.removed-api.txt}",
@@ -220,8 +204,8 @@ genrule {
genrule {
name: "combined-removed-dex",
srcs: [
":frameworks-base-api-removed-merged.txt",
":frameworks-base-api-system-removed-merged.txt",
":frameworks-base-api-removed.txt",
":frameworks-base-api-system-removed.txt",
":android.car-stubs-docs{.removed-api.txt}",
":android.car-system-stubs-docs{.removed-api.txt}",
],