Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375e1c29 authored Nov 05, 2024 by Harshit Mahajan

Add crashrecovery libraries to tests

Bug: 289203818
Test: Relevant tests pass successfully
Flag: build.release_crashrecovery_module
Change-Id: I3a8e9fe3df885e3ecd9c1b72babfe58d63c6d8a9

parent 364881a2

services/tests/mockingservicestests/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,7 +77,10 @@ android_test {
	"flag-junit",		"flag-junit",
	"am_flags_lib",		"am_flags_lib",
	"device_policy_aconfig_flags_lib",		"device_policy_aconfig_flags_lib",
	],		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
			"true": ["service-crashrecovery.impl"],
			default: [],
			}),

	libs: [		libs: [
	"android.test.mock.stubs.system",		"android.test.mock.stubs.system",

services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,10 @@ android_test {
	"services.core",		"services.core",
	"truth",		"truth",
	"flag-junit",		"flag-junit",
	],		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
			"true": ["service-crashrecovery.impl"],
			default: [],
			}),

	libs: [		libs: [
	"android.test.mock.stubs.system",		"android.test.mock.stubs.system",

services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,10 @@ android_test {
	"services.core",		"services.core",
	"truth",		"truth",
	"flag-junit",		"flag-junit",
	],		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
			"true": ["service-crashrecovery.impl"],
			default: [],
			}),

	libs: [		libs: [
	"android.test.mock.stubs.system",		"android.test.mock.stubs.system",

services/tests/servicestests/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -96,7 +96,10 @@ android_test {
	"CtsVirtualDeviceCommonLib",		"CtsVirtualDeviceCommonLib",
	"com_android_server_accessibility_flags_lib",		"com_android_server_accessibility_flags_lib",
	"locksettings_flags_lib",		"locksettings_flags_lib",
	],		] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
			"true": ["service-crashrecovery.impl"],
			default: [],
			}),

	libs: [		libs: [
	"android.hardware.power-V1-java",		"android.hardware.power-V1-java",

tests/PackageWatchdog/Android.bp

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,13 @@ android_test {
	"services.core",		"services.core",
	"services.net",		"services.net",
	"truth",		"truth",
			] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
			"true": [
			"service-crashrecovery.impl",
			"framework-crashrecovery.impl",
	],		],
			default: [],
			}),
	libs: ["android.test.runner.stubs.system"],		libs: ["android.test.runner.stubs.system"],
	jni_libs: [		jni_libs: [
	// mockito-target-extended dependencies		// mockito-target-extended dependencies