Replace manual genrule modules with combined_apis
This simplifies the addition of new modules by cutting down the number
of lists that the new module must be added to. The combined_apis module
generates equivalent genrules in a programmatic fashion.
Bug: 169103987
Test: `mmm frameworks/base/api` before and after and compare the soong
intermediates of that folder.
Merged-In: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
Change-Id: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
This commit is contained in:
Anton Hansson
351
api/Android.bp
351
api/Android.bp
@@ -102,43 +102,30 @@ genrule {
|
|||||||
visibility: ["//visibility:public"],
|
visibility: ["//visibility:public"],
|
||||||
}
|
}
|
||||||
|
|
||||||
genrule {
|
combined_apis {
|
||||||
name: "frameworks-base-api-current.txt",
|
name: "frameworks-base-api",
|
||||||
srcs: [
|
bootclasspath: [
|
||||||
":android.net.ipsec.ike{.public.api.txt}",
|
"android.net.ipsec.ike",
|
||||||
":art.module.public.api{.public.api.txt}",
|
"art.module.public.api",
|
||||||
":conscrypt.module.public.api{.public.api.txt}",
|
"conscrypt.module.public.api",
|
||||||
":framework-appsearch{.public.api.txt}",
|
"framework-appsearch",
|
||||||
":framework-connectivity{.public.api.txt}",
|
"framework-connectivity",
|
||||||
":framework-graphics{.public.api.txt}",
|
"framework-graphics",
|
||||||
":framework-media{.public.api.txt}",
|
"framework-media",
|
||||||
":framework-mediaprovider{.public.api.txt}",
|
"framework-mediaprovider",
|
||||||
":framework-permission{.public.api.txt}",
|
"framework-permission",
|
||||||
":framework-permission-s{.public.api.txt}",
|
"framework-permission-s",
|
||||||
":framework-scheduling{.public.api.txt}",
|
"framework-scheduling",
|
||||||
":framework-sdkextensions{.public.api.txt}",
|
"framework-sdkextensions",
|
||||||
":framework-statsd{.public.api.txt}",
|
"framework-statsd",
|
||||||
":framework-tethering{.public.api.txt}",
|
"framework-tethering",
|
||||||
":framework-wifi{.public.api.txt}",
|
"framework-wifi",
|
||||||
":i18n.module.public.api{.public.api.txt}",
|
"i18n.module.public.api",
|
||||||
":non-updatable-current.txt",
|
|
||||||
],
|
],
|
||||||
out: ["current.txt"],
|
system_server_classpath: [
|
||||||
tools: ["metalava"],
|
"service-media-s",
|
||||||
cmd: metalava_cmd + "$(in) --api $(out)",
|
"service-permission",
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "current.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/public/api",
|
|
||||||
dest: "android.txt",
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
visibility: ["//visibility:public"],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
genrule {
|
genrule {
|
||||||
@@ -157,108 +144,6 @@ genrule {
|
|||||||
"$(location :frameworks-base-api-current.txt)",
|
"$(location :frameworks-base-api-current.txt)",
|
||||||
}
|
}
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-current.srcjar",
|
|
||||||
srcs: [
|
|
||||||
":android.net.ipsec.ike{.public.stubs.source}",
|
|
||||||
":api-stubs-docs-non-updatable",
|
|
||||||
":art.module.public.api{.public.stubs.source}",
|
|
||||||
":conscrypt.module.public.api{.public.stubs.source}",
|
|
||||||
":framework-appsearch{.public.stubs.source}",
|
|
||||||
":framework-connectivity{.public.stubs.source}",
|
|
||||||
":framework-graphics{.public.stubs.source}",
|
|
||||||
":framework-media{.public.stubs.source}",
|
|
||||||
":framework-mediaprovider{.public.stubs.source}",
|
|
||||||
":framework-permission{.public.stubs.source}",
|
|
||||||
":framework-permission-s{.public.stubs.source}",
|
|
||||||
":framework-scheduling{.public.stubs.source}",
|
|
||||||
":framework-sdkextensions{.public.stubs.source}",
|
|
||||||
":framework-statsd{.public.stubs.source}",
|
|
||||||
":framework-tethering{.public.stubs.source}",
|
|
||||||
":framework-wifi{.public.stubs.source}",
|
|
||||||
":i18n.module.public.api{.public.stubs.source}",
|
|
||||||
],
|
|
||||||
out: ["current.srcjar"],
|
|
||||||
tools: ["merge_zips"],
|
|
||||||
cmd: "$(location merge_zips) $(out) $(in)",
|
|
||||||
visibility: ["//visibility:private"], // Used by make module in //development, mind.
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-removed.txt",
|
|
||||||
srcs: [
|
|
||||||
":android.net.ipsec.ike{.public.removed-api.txt}",
|
|
||||||
":art.module.public.api{.public.removed-api.txt}",
|
|
||||||
":conscrypt.module.public.api{.public.removed-api.txt}",
|
|
||||||
":framework-appsearch{.public.removed-api.txt}",
|
|
||||||
":framework-connectivity{.public.removed-api.txt}",
|
|
||||||
":framework-graphics{.public.removed-api.txt}",
|
|
||||||
":framework-media{.public.removed-api.txt}",
|
|
||||||
":framework-mediaprovider{.public.removed-api.txt}",
|
|
||||||
":framework-permission{.public.removed-api.txt}",
|
|
||||||
":framework-permission-s{.public.removed-api.txt}",
|
|
||||||
":framework-scheduling{.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}",
|
|
||||||
":i18n.module.public.api{.public.removed-api.txt}",
|
|
||||||
":non-updatable-removed.txt",
|
|
||||||
],
|
|
||||||
out: ["removed.txt"],
|
|
||||||
tools: ["metalava"],
|
|
||||||
cmd: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "removed.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/public/api",
|
|
||||||
dest: "removed.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-system-current.txt",
|
|
||||||
srcs: [
|
|
||||||
":art.module.public.api{.system.api.txt}",
|
|
||||||
":android.net.ipsec.ike{.system.api.txt}",
|
|
||||||
":framework-appsearch{.system.api.txt}",
|
|
||||||
":framework-connectivity{.system.api.txt}",
|
|
||||||
":framework-graphics{.system.api.txt}",
|
|
||||||
":framework-media{.system.api.txt}",
|
|
||||||
":framework-mediaprovider{.system.api.txt}",
|
|
||||||
":framework-permission{.system.api.txt}",
|
|
||||||
":framework-permission-s{.system.api.txt}",
|
|
||||||
":framework-scheduling{.system.api.txt}",
|
|
||||||
":framework-sdkextensions{.system.api.txt}",
|
|
||||||
":framework-statsd{.system.api.txt}",
|
|
||||||
":framework-tethering{.system.api.txt}",
|
|
||||||
":framework-wifi{.system.api.txt}",
|
|
||||||
":non-updatable-system-current.txt",
|
|
||||||
],
|
|
||||||
out: ["system-current.txt"],
|
|
||||||
tools: ["metalava"],
|
|
||||||
cmd: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "system-current.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/system/api",
|
|
||||||
dest: "android.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
visibility: ["//visibility:public"],
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
genrule {
|
||||||
name: "frameworks-base-api-system-current-compat",
|
name: "frameworks-base-api-system-current-compat",
|
||||||
srcs: [
|
srcs: [
|
||||||
@@ -277,79 +162,6 @@ genrule {
|
|||||||
"$(location :frameworks-base-api-system-current.txt)",
|
"$(location :frameworks-base-api-system-current.txt)",
|
||||||
}
|
}
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-system-removed.txt",
|
|
||||||
srcs: [
|
|
||||||
":art.module.public.api{.system.removed-api.txt}",
|
|
||||||
":android.net.ipsec.ike{.system.removed-api.txt}",
|
|
||||||
":framework-appsearch{.system.removed-api.txt}",
|
|
||||||
":framework-connectivity{.system.removed-api.txt}",
|
|
||||||
":framework-graphics{.system.removed-api.txt}",
|
|
||||||
":framework-media{.system.removed-api.txt}",
|
|
||||||
":framework-mediaprovider{.system.removed-api.txt}",
|
|
||||||
":framework-permission{.system.removed-api.txt}",
|
|
||||||
":framework-permission-s{.system.removed-api.txt}",
|
|
||||||
":framework-scheduling{.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: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "system-removed.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/system/api",
|
|
||||||
dest: "removed.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
visibility: ["//visibility:public"],
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-module-lib-current.txt",
|
|
||||||
srcs: [
|
|
||||||
":art.module.public.api{.module-lib.api.txt}",
|
|
||||||
":android.net.ipsec.ike{.module-lib.api.txt}",
|
|
||||||
":framework-appsearch{.module-lib.api.txt}",
|
|
||||||
":framework-connectivity{.module-lib.api.txt}",
|
|
||||||
":framework-graphics{.module-lib.api.txt}",
|
|
||||||
":framework-media{.module-lib.api.txt}",
|
|
||||||
":framework-mediaprovider{.module-lib.api.txt}",
|
|
||||||
":framework-permission{.module-lib.api.txt}",
|
|
||||||
":framework-permission-s{.module-lib.api.txt}",
|
|
||||||
":framework-scheduling{.module-lib.api.txt}",
|
|
||||||
":framework-sdkextensions{.module-lib.api.txt}",
|
|
||||||
":framework-statsd{.module-lib.api.txt}",
|
|
||||||
":framework-tethering{.module-lib.api.txt}",
|
|
||||||
":framework-wifi{.module-lib.api.txt}",
|
|
||||||
":non-updatable-module-lib-current.txt",
|
|
||||||
],
|
|
||||||
out: ["module-lib-current.txt"],
|
|
||||||
tools: ["metalava"],
|
|
||||||
cmd: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "module-lib-current.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/module-lib/api",
|
|
||||||
dest: "android.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
genrule {
|
||||||
name: "frameworks-base-api-module-lib-current-compat",
|
name: "frameworks-base-api-module-lib-current-compat",
|
||||||
srcs: [
|
srcs: [
|
||||||
@@ -371,42 +183,6 @@ genrule {
|
|||||||
"$(location :frameworks-base-api-module-lib-current.txt)",
|
"$(location :frameworks-base-api-module-lib-current.txt)",
|
||||||
}
|
}
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-module-lib-removed.txt",
|
|
||||||
srcs: [
|
|
||||||
":art.module.public.api{.module-lib.removed-api.txt}",
|
|
||||||
":android.net.ipsec.ike{.module-lib.removed-api.txt}",
|
|
||||||
":framework-appsearch{.module-lib.removed-api.txt}",
|
|
||||||
":framework-connectivity{.module-lib.removed-api.txt}",
|
|
||||||
":framework-graphics{.module-lib.removed-api.txt}",
|
|
||||||
":framework-media{.module-lib.removed-api.txt}",
|
|
||||||
":framework-mediaprovider{.module-lib.removed-api.txt}",
|
|
||||||
":framework-permission{.module-lib.removed-api.txt}",
|
|
||||||
":framework-permission-s{.module-lib.removed-api.txt}",
|
|
||||||
":framework-scheduling{.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: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "module-lib-removed.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/module-lib/api",
|
|
||||||
dest: "removed.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
genrule {
|
||||||
name: "combined-removed-dex",
|
name: "combined-removed-dex",
|
||||||
visibility: [
|
visibility: [
|
||||||
@@ -423,86 +199,3 @@ genrule {
|
|||||||
out: ["combined-removed-dex.txt"],
|
out: ["combined-removed-dex.txt"],
|
||||||
cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",
|
cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",
|
||||||
}
|
}
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-system-server-current.txt",
|
|
||||||
srcs: [
|
|
||||||
":service-media-s{.system-server.api.txt}",
|
|
||||||
":service-permission{.system-server.api.txt}",
|
|
||||||
":non-updatable-system-server-current.txt",
|
|
||||||
],
|
|
||||||
out: ["system-server-current.txt"],
|
|
||||||
tools: ["metalava"],
|
|
||||||
cmd: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "system-server-current.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/system-server/api",
|
|
||||||
dest: "android.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
genrule {
|
|
||||||
name: "frameworks-base-api-system-server-removed.txt",
|
|
||||||
srcs: [
|
|
||||||
":service-media-s{.system-server.removed-api.txt}",
|
|
||||||
":service-permission{.system-server.removed-api.txt}",
|
|
||||||
":non-updatable-system-server-removed.txt",
|
|
||||||
],
|
|
||||||
out: ["system-server-removed.txt"],
|
|
||||||
tools: ["metalava"],
|
|
||||||
cmd: metalava_cmd + "$(in) --api $(out)",
|
|
||||||
dists: [
|
|
||||||
{
|
|
||||||
targets: ["droidcore"],
|
|
||||||
dir: "api",
|
|
||||||
dest: "system-server-removed.txt",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
targets: ["sdk"],
|
|
||||||
dir: "apistubs/android/system-server/api",
|
|
||||||
dest: "removed.txt",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
// This rule will filter classes present in the jar files of mainline modules
|
|
||||||
// from the lint database in api-versions.xml.
|
|
||||||
// This is done to reduce the number of false positive NewApi findings in
|
|
||||||
// java libraries that compile against the module SDK
|
|
||||||
genrule {
|
|
||||||
name: "api-versions-xml-public-filtered",
|
|
||||||
srcs: [
|
|
||||||
// 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
|
|
||||||
":framework-doc-stubs{.api_versions.xml}",
|
|
||||||
":android.net.ipsec.ike.stubs{.jar}",
|
|
||||||
":conscrypt.module.public.api.stubs{.jar}",
|
|
||||||
":framework-appsearch.stubs{.jar}",
|
|
||||||
":framework-connectivity.stubs{.jar}",
|
|
||||||
":framework-graphics.stubs{.jar}",
|
|
||||||
":framework-media.stubs{.jar}",
|
|
||||||
":framework-mediaprovider.stubs{.jar}",
|
|
||||||
":framework-permission.stubs{.jar}",
|
|
||||||
":framework-permission-s.stubs{.jar}",
|
|
||||||
":framework-scheduling.stubs{.jar}",
|
|
||||||
":framework-sdkextensions.stubs{.jar}",
|
|
||||||
":framework-statsd.stubs{.jar}",
|
|
||||||
":framework-tethering.stubs{.jar}",
|
|
||||||
":framework-wifi.stubs{.jar}",
|
|
||||||
":i18n.module.public.api.stubs{.jar}",
|
|
||||||
],
|
|
||||||
out: ["api-versions-public-filtered.xml"],
|
|
||||||
tools: ["api_versions_trimmer"],
|
|
||||||
cmd: "$(location api_versions_trimmer) $(out) $(in)",
|
|
||||||
dist: {
|
|
||||||
targets: ["sdk"],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user