Merge "Merge latest API into single file before checking compatibility" into main (d4e030c9) · Commits · e / os / android_frameworks_base

api/Android.bp

+48 −12

Original line number	Diff line number	Diff line
		@@ -125,27 +125,54 @@ combined_apis {
		}),
		}

		// Create a single file containing the latest released version of the whole
		// Android public API.
		java_genrule {
		name: "android.api.merged.public.latest",
		srcs: [
		":android.api.combined.public.latest",
		],
		out: ["public-latest.txt"],
		tools: ["metalava"],
		cmd: metalava_cmd + " merge-signatures --format=2.0 $(in) --out $(out)",
		}

		// Make sure that the Android public API is compatible with the
		// previously released public API.
		java_genrule {
		name: "frameworks-base-api-current-compat",
		srcs: [
		":android.api.public.latest",
		":android.api.merged.public.latest",
		":android-incompatibilities.api.public.latest",
		":frameworks-base-api-current.txt",
		],
		out: ["updated-baseline.txt"],
		tools: ["metalava"],
		cmd: metalava_cmd +
		"--check-compatibility:api:released $(location :android.api.public.latest) " +
		"--check-compatibility:api:released $(location :android.api.merged.public.latest) " +
		"--baseline:compatibility:released $(location :android-incompatibilities.api.public.latest) " +
		"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
		"$(location :frameworks-base-api-current.txt)",
		}

		// Create a single file containing the latest released version of the whole
		// Android system API.
		java_genrule {
		name: "android.api.merged.system.latest",
		srcs: [
		":android.api.combined.system.latest",
		],
		out: ["system-latest.txt"],
		tools: ["metalava"],
		cmd: metalava_cmd + " merge-signatures --format=2.0 $(in) --out $(out)",
		}

		// Make sure that the Android system API is compatible with the
		// previously released system API.
		java_genrule {
		name: "frameworks-base-api-system-current-compat",
		srcs: [
		":android.api.public.latest",
		":android.api.system.latest",
		":android.api.merged.system.latest",
		":android-incompatibilities.api.system.latest",
		":frameworks-base-api-current.txt",
		":frameworks-base-api-system-current.txt",
		@@ -153,20 +180,31 @@ java_genrule {
		out: ["updated-baseline.txt"],
		tools: ["metalava"],
		cmd: metalava_cmd +
		"--check-compatibility:api:released $(location :android.api.public.latest) " +
		"--check-compatibility:api:released $(location :android.api.system.latest) " +
		"--check-compatibility:api:released $(location :android.api.merged.system.latest) " +
		"--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " +
		"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
		"$(location :frameworks-base-api-current.txt) " +
		"$(location :frameworks-base-api-system-current.txt)",
		}

		// Create a single file containing the latest released version of the whole
		// Android module-lib API.
		java_genrule {
		name: "android.api.merged.module-lib.latest",
		srcs: [
		":android.api.combined.module-lib.latest",
		],
		out: ["module-lib-latest.txt"],
		tools: ["metalava"],
		cmd: metalava_cmd + " merge-signatures --format=2.0 $(in) --out $(out)",
		}

		// Make sure that the Android module-lib API is compatible with the
		// previously released module-lib API.
		java_genrule {
		name: "frameworks-base-api-module-lib-current-compat",
		srcs: [
		":android.api.public.latest",
		":android.api.system.latest",
		":android.api.module-lib.latest",
		":android.api.merged.module-lib.latest",
		":android-incompatibilities.api.module-lib.latest",
		":frameworks-base-api-current.txt",
		":frameworks-base-api-system-current.txt",
		@@ -175,9 +213,7 @@ java_genrule {
		out: ["updated-baseline.txt"],
		tools: ["metalava"],
		cmd: metalava_cmd +
		"--check-compatibility:api:released $(location :android.api.public.latest) " +
		"--check-compatibility:api:released $(location :android.api.system.latest) " +
		"--check-compatibility:api:released $(location :android.api.module-lib.latest) " +
		"--check-compatibility:api:released $(location :android.api.merged.module-lib.latest) " +
		"--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " +
		"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
		"$(location :frameworks-base-api-current.txt) " +