Merge "[Ravenwood] Prevent dexmaker from going into Ravenwood tests" into main (75899a71) · Commits · e / os / android_frameworks_base

core/tests/coretests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ android_ravenwood_test {
		"androidx.test.rules",
		"androidx.test.ext.junit",
		"androidx.test.uiautomator_uiautomator",
		"compatibility-device-util-axt",
		"compatibility-device-util-axt-ravenwood",
		"flag-junit",
		"platform-test-annotations",
		"flag-junit",

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ android_ravenwood_test {
		"androidx.annotation_annotation",
		"androidx.test.rules",
		"frameworks-base-testutils",
		"servicestests-utils",
		"servicestests-utils-ravenwood",
		],
		srcs: [
		"src/android/util/IRemoteMemoryIntArray.aidl",

+14 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,20 @@ java_library {
		],
		}

		java_library {
		name: "servicestests-utils-ravenwood",
		srcs: [
		"utils/*/.java",
		"utils/*/.kt",
		"utils-mockito/*/.kt",
		],
		libs: [
		"android.test.runner.stubs.system",
		"junit",
		"mockito-ravenwood-prebuilt",
		],
		}

		java_library {
		name: "mockito-test-utils",
		srcs: [