Merge "Remove filegroups for *current.txt files" (2a8f6d00) · Commits · e / os / android_frameworks_base

api/Android.bp

+11 −27

Original line number	Diff line number	Diff line
		@@ -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-media{.public.api.txt}",
		@@ -72,10 +53,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-media{.public.removed-api.txt}",
		@@ -100,7 +82,7 @@ genrule {
		}

		genrule {
		name: "frameworks-base-api-system-current-merged.txt",
		name: "frameworks-base-api-system-current.txt",
		srcs: [
		":framework-media{.system.api.txt}",
		":framework-mediaprovider{.system.api.txt}",
		@@ -126,10 +108,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-media{.system.removed-api.txt}",
		":framework-mediaprovider{.system.removed-api.txt}",
		@@ -150,10 +133,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-media{.module-lib.api.txt}",
		":framework-mediaprovider{.module-lib.api.txt}",
		@@ -182,7 +166,7 @@ genrule {
		}

		genrule {
		name: "frameworks-base-api-module-lib-removed-merged.txt",
		name: "frameworks-base-api-module-lib-removed.txt",
		srcs: [
		":framework-media{.module-lib.removed-api.txt}",
		":framework-mediaprovider{.module-lib.removed-api.txt}",
		@@ -208,8 +192,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}",
		],