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

Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234

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

Change-Id: I8e57f13db22b46bf1394dd43b905bb0bf8510d18
This commit is contained in:
Anton Hansson
2020-09-30 14:19:18 +00:00
committed by Automerger Merge Worker
parent 230fabb17e 27b40fc234
commit de51075d79
2 changed files with 0 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
api/Android.bp
View File

@@ -62,24 +62,6 @@ genrule {
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
} }
genrule {
name: "frameworks-base-api-removed-merged.txt",
srcs: [
":conscrypt.module.public.api{.public.removed-api.txt}",
":framework-media{.public.removed-api.txt}",
":framework-mediaprovider{.public.removed-api.txt}",
":framework-permission{.public.removed-api.txt}",
":framework-sdkextensions{.public.removed-api.txt}",
":framework-statsd{.public.removed-api.txt}",
":framework-tethering{.public.removed-api.txt}",
":framework-wifi{.public.removed-api.txt}",
":non-updatable-removed.txt",
],
out: ["removed.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
}
genrule { genrule {
name: "frameworks-base-api-system-current-merged.txt", name: "frameworks-base-api-system-current-merged.txt",
srcs: [ srcs: [
@@ -97,23 +79,6 @@ genrule {
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
} }
genrule {
name: "frameworks-base-api-system-removed-merged.txt",
srcs: [
":framework-media{.system.removed-api.txt}",
":framework-mediaprovider{.system.removed-api.txt}",
":framework-permission{.system.removed-api.txt}",
":framework-sdkextensions{.system.removed-api.txt}",
":framework-statsd{.system.removed-api.txt}",
":framework-tethering{.system.removed-api.txt}",
":framework-wifi{.system.removed-api.txt}",
":non-updatable-system-removed.txt",
],
out: ["system-removed.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
}
genrule { genrule {
name: "frameworks-base-api-module-lib-current-merged.txt", name: "frameworks-base-api-module-lib-current-merged.txt",
srcs: [ srcs: [
@@ -130,20 +95,3 @@ genrule {
tools: ["metalava"], tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)", cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
} }
genrule {
name: "frameworks-base-api-module-lib-removed-merged.txt",
srcs: [
":framework-media{.module-lib.removed-api.txt}",
":framework-mediaprovider{.module-lib.removed-api.txt}",
":framework-permission{.module-lib.removed-api.txt}",
":framework-sdkextensions{.module-lib.removed-api.txt}",
":framework-statsd{.module-lib.removed-api.txt}",
":framework-tethering{.module-lib.removed-api.txt}",
":framework-wifi{.module-lib.removed-api.txt}",
":non-updatable-module-lib-removed.txt",
],
out: ["module-lib-removed.txt"],
tools: ["metalava"],
cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
}

18
non-updatable-api/Android.bp
View File

@@ -22,32 +22,14 @@ filegroup {
visibility: ["//frameworks/base/api"], visibility: ["//frameworks/base/api"],
} }
filegroup {
name: "non-updatable-removed.txt",
srcs: ["removed.txt"],
visibility: ["//frameworks/base/api"],
}
filegroup { filegroup {
name: "non-updatable-system-current.txt", name: "non-updatable-system-current.txt",
srcs: ["system-current.txt"], srcs: ["system-current.txt"],
visibility: ["//frameworks/base/api"], visibility: ["//frameworks/base/api"],
} }
filegroup {
name: "non-updatable-system-removed.txt",
srcs: ["system-removed.txt"],
visibility: ["//frameworks/base/api"],
}
filegroup { filegroup {
name: "non-updatable-module-lib-current.txt", name: "non-updatable-module-lib-current.txt",
srcs: ["module-lib-current.txt"], srcs: ["module-lib-current.txt"],
visibility: ["//frameworks/base/api"], visibility: ["//frameworks/base/api"],
} }
filegroup {
name: "non-updatable-module-lib-removed.txt",
srcs: ["module-lib-removed.txt"],
visibility: ["//frameworks/base/api"],
}