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

Commit 0187756c authored Sep 28, 2023 by Carlos Galo

mockingservicestest: adding jni dependency for OomConnection



Test: atest all tests under mockingservicestests/../server/am
Bug: 244232958
Change-Id: Idd7d49774806ade196d2a6e5191fe2b8c8a60dd9
Signed-off-by: Carlos Galo <carlosgalo@google.com>
Merged-In: Idd7d49774806ade196d2a6e5191fe2b8c8a60dd9

parent 299d7070

services/tests/mockingservicestests/jni/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ cc_library_shared {
		srcs: [
		":lib_cachedAppOptimizer_native",
		":lib_gameManagerService_native",
		":lib_oomConnection_native",
		"onload.cpp",
		],

		@@ -42,6 +43,7 @@ cc_library_shared {
		"libgui",
		"libhidlbase",
		"liblog",
		"libmemevents",
		"libmeminfo",
		"libnativehelper",
		"libprocessgroup",

services/tests/mockingservicestests/jni/onload.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		namespace android {
		int register_android_server_am_CachedAppOptimizer(JNIEnv* env);
		int register_android_server_app_GameManagerService(JNIEnv* env);
		int register_android_server_am_OomConnection(JNIEnv* env);
		};

		using namespace android;
		@@ -42,6 +43,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
		ALOG_ASSERT(env, "Could not retrieve the env!");
		register_android_server_am_CachedAppOptimizer(env);
		register_android_server_app_GameManagerService(env);
		register_android_server_am_OomConnection(env);
		return JNI_VERSION_1_4;
		}

services/tests/mockingservicestests/src/com/android/server/am/ActivityManagerInternalTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -218,4 +218,9 @@ public class ActivityManagerInternalTest {
		assertEquals(errMsg, Thread.State.TERMINATED, getState());
		}
		}

		// TODO: [b/302724778] Remove manual JNI load
		static {
		System.loadLibrary("mockingservicestestjni");
		}
		}

services/tests/mockingservicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1210,4 +1210,9 @@ public class ActivityManagerServiceTest {
		return returnValueForstartUserOnSecondaryDisplay;
		}
		}

		// TODO: [b/302724778] Remove manual JNI load
		static {
		System.loadLibrary("mockingservicestestjni");
		}
		}

services/tests/mockingservicestests/src/com/android/server/am/AppChildProcessTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -338,4 +338,8 @@ public class AppChildProcessTest {
		}
		}

		// TODO: [b/302724778] Remove manual JNI load
		static {
		System.loadLibrary("mockingservicestestjni");
		}
		}