Merge "Remove use of --check-compatibility:base" into main (88c837ff) · Commits · e / os / android_frameworks_base

api/Android.bp

+10 −7

Original line number	Original line	Diff line number	Diff line
	@@ -157,6 +157,7 @@ genrule {
	genrule {		genrule {
	name: "frameworks-base-api-system-current-compat",		name: "frameworks-base-api-system-current-compat",
	srcs: [		srcs: [
			":android.api.public.latest",
	":android.api.system.latest",		":android.api.system.latest",
	":android-incompatibilities.api.system.latest",		":android-incompatibilities.api.system.latest",
	":frameworks-base-api-current.txt",		":frameworks-base-api-current.txt",
	@@ -165,33 +166,35 @@ genrule {
	out: ["updated-baseline.txt"],		out: ["updated-baseline.txt"],
	tools: ["metalava"],		tools: ["metalava"],
	cmd: metalava_cmd +		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.system.latest) " +
	"--check-compatibility:base $(location :frameworks-base-api-current.txt) " +
	"--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " +		"--baseline:compatibility:released $(location :android-incompatibilities.api.system.latest) " +
	"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +		"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
			"$(location :frameworks-base-api-current.txt) " +
	"$(location :frameworks-base-api-system-current.txt)",		"$(location :frameworks-base-api-system-current.txt)",
	}		}

	genrule {		genrule {
	name: "frameworks-base-api-module-lib-current-compat",		name: "frameworks-base-api-module-lib-current-compat",
	srcs: [		srcs: [
			":android.api.public.latest",
			":android.api.system.latest",
	":android.api.module-lib.latest",		":android.api.module-lib.latest",
	":android-incompatibilities.api.module-lib.latest",		":android-incompatibilities.api.module-lib.latest",
	":frameworks-base-api-current.txt",		":frameworks-base-api-current.txt",
			":frameworks-base-api-system-current.txt",
	":frameworks-base-api-module-lib-current.txt",		":frameworks-base-api-module-lib-current.txt",
	],		],
	out: ["updated-baseline.txt"],		out: ["updated-baseline.txt"],
	tools: ["metalava"],		tools: ["metalava"],
	cmd: metalava_cmd +		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.module-lib.latest) " +
	// Note: having "public" be the base of module-lib is not perfect -- it should
	// ideally be a merged public+system (which metalava is not currently able to generate).
	// This "base" will help when migrating from MODULE_LIBS -> public, but not when
	// migrating from MODULE_LIBS -> system (where it needs to instead be listed as
	// an incompatibility).
	"--check-compatibility:base $(location :frameworks-base-api-current.txt) " +
	"--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " +		"--baseline:compatibility:released $(location :android-incompatibilities.api.module-lib.latest) " +
	"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +		"--update-baseline:compatibility:released $(genDir)/updated-baseline.txt " +
			"$(location :frameworks-base-api-current.txt) " +
			"$(location :frameworks-base-api-system-current.txt) " +
	"$(location :frameworks-base-api-module-lib-current.txt)",		"$(location :frameworks-base-api-module-lib-current.txt)",
	}		}