Merge "Make sure bare minimum ravenwood test can use "module_current"" into main (869ac441) · Commits · e / os / android_frameworks_base

ravenwood/tests/minimum-test/Android.bp

+15 −3

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

	// Minimum ravenwood test according to test-authors.md.		java_defaults {
	android_ravenwood_test {		name: "RavenwoodMinimumTest-defaults",
	name: "RavenwoodMinimumTest",

	static_libs: [		static_libs: [
	"androidx.annotation_annotation",		"androidx.annotation_annotation",
	@@ -23,3 +22,16 @@ android_ravenwood_test {
	sdk_version: "test_current",		sdk_version: "test_current",
	auto_gen_config: true,		auto_gen_config: true,
	}		}

			// Minimum ravenwood test according to test-authors.md.
			android_ravenwood_test {
			name: "RavenwoodMinimumTest",
			defaults: ["RavenwoodMinimumTest-defaults"],
			}

			// Make sure Ravenwood tests can use "module_current" too.
			android_ravenwood_test {
			name: "RavenwoodMinimumTest-with-module-current",
			defaults: ["RavenwoodMinimumTest-defaults"],
			sdk_version: "module_current",
			}