Merge "Remove *-light tests" into main (f54046d6) · Commits · e / os / android_frameworks_base

ravenwood/TEST_MAPPING

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -156,18 +156,10 @@
	"name": "RavenwoodBivalentTest",		"name": "RavenwoodBivalentTest",
	"host": true		"host": true
	},		},
	{
	"name": "RavenwoodBivalentTest-light",
	"host": true
	},
	{		{
	"name": "RavenwoodCoreTest",		"name": "RavenwoodCoreTest",
	"host": true		"host": true
	},		},
	{
	"name": "RavenwoodCoreTest-light",
	"host": true
	},
	{		{
	"name": "RavenwoodMinimumTest",		"name": "RavenwoodMinimumTest",
	"host": true		"host": true

ravenwood/tests/bivalenttest/Android.bp

+2 −26

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ cc_library_shared {
	}		}

	java_defaults {		java_defaults {
	name: "ravenwood-bivalent-light-defaults",		name: "ravenwood-bivalent-defaults",
	static_libs: [		static_libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"androidx.test.ext.junit",		"androidx.test.ext.junit",
	@@ -44,6 +44,7 @@ java_defaults {

	"junit-params",		"junit-params",
	"platform-compat-test-rules",		"platform-compat-test-rules",
			"platform-parametric-runner-lib-no-robo",

	// To make sure it won't cause VerifyError (b/324063814)		// To make sure it won't cause VerifyError (b/324063814)
	"platformprotosnano",		"platformprotosnano",
	@@ -59,17 +60,6 @@ java_defaults {
	],		],
	}		}

	java_defaults {
	name: "ravenwood-bivalent-defaults",
	defaults: [
	"ravenwood-bivalent-light-defaults",
	],
	static_libs: [
	// This has a robolectric dependency, which would slow down builds.
	"platform-parametric-runner-lib",
	],
	}

	android_ravenwood_test {		android_ravenwood_test {
	name: "RavenwoodBivalentTest",		name: "RavenwoodBivalentTest",
	defaults: ["ravenwood-bivalent-defaults"],		defaults: ["ravenwood-bivalent-defaults"],
	@@ -78,20 +68,6 @@ android_ravenwood_test {
	auto_gen_config: true,		auto_gen_config: true,
	}		}

	// Same as RavenwoodBivalentTest, minus ravenizer/*, to remove
	// the "platform-parametric-runner-lib" dependency, for faster rebuilds
	android_ravenwood_test {
	name: "RavenwoodBivalentTest-light",
	defaults: ["ravenwood-bivalent-light-defaults"],
	exclude_srcs: [
	"test/*/ravenizer/.java",
	"test/*/ravenizer/.kt",
	],
	target_sdk_version: "34",
	package_name: "com.android.ravenwoodtest.bivalenttest",
	auto_gen_config: true,
	}

	java_defaults {		java_defaults {
	name: "ravenwood-bivalent-device-defaults",		name: "ravenwood-bivalent-device-defaults",
	defaults: ["ravenwood-bivalent-defaults"],		defaults: ["ravenwood-bivalent-defaults"],

ravenwood/tests/coretest/Android.bp

+3 −22

Original line number	Original line	Diff line number	Diff line
	@@ -7,15 +7,14 @@ package {
	default_applicable_licenses: ["frameworks_base_license"],		default_applicable_licenses: ["frameworks_base_license"],
	}		}

	java_defaults {		android_ravenwood_test {
	name: "RavenwoodCoreTest_defaults",		name: "RavenwoodCoreTest",

	static_libs: [		static_libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	"androidx.test.ext.junit",		"androidx.test.ext.junit",
	"androidx.test.rules",		"androidx.test.rules",
	"junit-params",		"junit-params",
	"platform-parametric-runner-lib",		"platform-parametric-runner-lib-no-robo",

	// This library should be removed by Ravenizer		// This library should be removed by Ravenizer
	"mockito-target-minus-junit4",		"mockito-target-minus-junit4",
	@@ -52,21 +51,3 @@ java_defaults {
	auto_gen_config: true,		auto_gen_config: true,
	jarjar_rules: "empty.txt",		jarjar_rules: "empty.txt",
	}		}

	android_ravenwood_test {
	name: "RavenwoodCoreTest",
	defaults: ["RavenwoodCoreTest_defaults"],
	static_libs: [
	"platform-parametric-runner-lib",
	],
	}

	// Same as RavenwoodCoreTest, but it excludes tests using platform-parametric-runner-lib,
	// because that modules has too many dependencies and slow to build incrementally.
	android_ravenwood_test {
	name: "RavenwoodCoreTest-light",
	defaults: ["RavenwoodCoreTest_defaults"],
	exclude_srcs: [
	"test/com/android/ravenwoodtest/runnercallbacktests/*",
	],
	}