Merge "Revert "Remove direct dependency from FrameworksCoreTestsRavenwood"" into main (0ab769f8) · Commits · e / os / android_frameworks_base

core/tests/coretests/Android.bp

+4 −32

Original line number	Diff line number	Diff line
		@@ -28,19 +28,10 @@ filegroup {
		visibility: ["//visibility:private"],
		}

		java_defaults {
		name: "FrameworksCoreTests-resources",
		aaptflags: [
		"-0 .dat",
		"-0 .gld",
		"-c fa",
		],
		resource_dirs: ["res"],
		}

		android_test {
		name: "FrameworksCoreTests",
		defaults: ["FrameworksCoreTests-resources"],
		// FrameworksCoreTestsRavenwood references the .aapt.srcjar
		use_resource_processor: false,

		srcs: [
		"src/*/.java",
		@@ -126,6 +117,7 @@ android_test {

		certificate: "platform",

		resource_dirs: ["res"],
		resource_zips: [":FrameworksCoreTests_apks_as_resources"],
		java_resources: [":FrameworksCoreTests_unit_test_cert_der"],

		@@ -136,22 +128,6 @@ android_test {
		],
		}

		// FrameworksCoreTestsRavenwood pulls in the R.java class from this one.
		// Note, "FrameworksCoreTests" and "FrameworksCoreTests-resonly" _might_ not have indentical
		// R.java (not sure if there's a guarantee), but that doesn't matter as long as
		// FrameworksCoreTestsRavenwood consistently uses the R definition in this module.
		android_app {
		name: "FrameworksCoreTests-resonly",
		defaults: ["FrameworksCoreTests-resources"],

		// FrameworksCoreTestsRavenwood references the .aapt.srcjar
		use_resource_processor: false,
		libs: [
		"framework-res",
		],
		sdk_version: "core_platform",
		}

		// Rules to copy all the test apks to the intermediate raw resource directory
		java_genrule {
		name: "FrameworksCoreTests_apks_as_resources",
		@@ -249,11 +225,7 @@ android_ravenwood_test {
		"src/com/android/internal/util/*/.java",
		"src/com/android/internal/power/EnergyConsumerStatsTest.java",

		// Pull in R.java from FrameworksCoreTests-resonly, not from FrameworksCoreTests,
		// to avoid having a dependency to FrameworksCoreTests.
		// This way, when updating source files and running this test, we don't need to
		// rebuild the entire FrameworksCoreTests, which would be slow.
		":FrameworksCoreTests-resonly{.aapt.srcjar}",
		":FrameworksCoreTests{.aapt.srcjar}",
		":FrameworksCoreTests-aidl",
		":FrameworksCoreTests-helpers",
		":FrameworksCoreTestDoubles-sources",