From 75068d5340e840f59ce83cace4d9c2da38beb5ba Mon Sep 17 00:00:00 2001 From: John Wu Date: Tue, 26 Nov 2024 01:48:37 +0000 Subject: [Ravenwood] Merge libinit and libsysprop Flag: EXEMPT host test change only Bug: 292141694 Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh Change-Id: Ie475a13f979ee8aaceb19adf8525e16654f6da20 --- .../ravenwood/RavenwoodRuntimeEnvironmentController.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'ravenwood/junit-impl-src') diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java index b3987f4987df..172cec3b8e13 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java @@ -103,7 +103,6 @@ public class RavenwoodRuntimeEnvironmentController { private static final String MAIN_THREAD_NAME = "RavenwoodMain"; private static final String LIBRAVENWOOD_INITIALIZER_NAME = "ravenwood_initializer"; - private static final String RAVENWOOD_NATIVE_SYSPROP_NAME = "ravenwood_sysprop"; private static final String RAVENWOOD_NATIVE_RUNTIME_NAME = "ravenwood_runtime"; /** @@ -215,8 +214,12 @@ public class RavenwoodRuntimeEnvironmentController { Thread.setDefaultUncaughtExceptionHandler(sUncaughtExceptionHandler); } - // Some process-wide initialization. (maybe redirect stdout/stderr) - RavenwoodCommonUtils.loadJniLibrary(LIBRAVENWOOD_INITIALIZER_NAME); + // Some process-wide initialization: + // - maybe redirect stdout/stderr + // - override native system property functions + var lib = RavenwoodCommonUtils.getJniLibraryPath(LIBRAVENWOOD_INITIALIZER_NAME); + System.load(lib); + RavenwoodRuntimeNative.reloadNativeLibrary(lib); // Redirect stdout/stdin to the Log API. RuntimeInit.redirectLogStreams(); @@ -226,11 +229,6 @@ public class RavenwoodRuntimeEnvironmentController { // We haven't initialized liblog yet, so directly write to System.out here. RavenwoodCommonUtils.log(TAG, "globalInitInner()"); - // Load libravenwood_sysprop before other libraries that may use SystemProperties. - var libProp = RavenwoodCommonUtils.getJniLibraryPath(RAVENWOOD_NATIVE_SYSPROP_NAME); - System.load(libProp); - RavenwoodRuntimeNative.reloadNativeLibrary(libProp); - // Make sure libravenwood_runtime is loaded. System.load(RavenwoodCommonUtils.getJniLibraryPath(RAVENWOOD_NATIVE_RUNTIME_NAME)); -- cgit v1.2.3-59-g8ed1b