diff options
| author | 2024-11-06 12:53:00 -0800 | |
|---|---|---|
| committer | 2024-11-06 13:54:57 -0800 | |
| commit | b07f68d6bf5fc9bdc41e190855cb9017141c665a (patch) | |
| tree | 50678a14a8ff98afa400b4eca050d52b5fa8c721 /ravenwood/junit-impl-src/android | |
| parent | 1a4cdb3313225b695730791425fc62894dd9531d (diff) | |
Isolate Ravenwood sysprops from device sysprops
Now we use hardcoded sysprops for the most part.
We only pull in selected properties from build.prop.
Flag: EXEMPT host test change only
Bug: 377577035
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: I5ff27ab8123858c71ad2645448865d8cb081b250
Diffstat (limited to 'ravenwood/junit-impl-src/android')
| -rw-r--r-- | ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java | 5 |
1 files changed, 1 insertions, 4 deletions
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 91778579ab28..c5a9c7b28ad3 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java @@ -22,7 +22,6 @@ import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_INST_R import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_RESOURCE_APK; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERBOSE_LOGGING; import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERSION_JAVA_SYSPROP; -import static com.android.ravenwood.common.RavenwoodCommonUtils.getRavenwoodRuntimePath; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; @@ -90,8 +89,6 @@ public class RavenwoodRuntimeEnvironmentController { 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"; - private static final String RAVENWOOD_BUILD_PROP = - getRavenwoodRuntimePath() + "ravenwood-data/build.prop"; /** * When enabled, attempt to dump all thread stacks just before we hit the @@ -204,7 +201,7 @@ public class RavenwoodRuntimeEnvironmentController { System.load(RavenwoodCommonUtils.getJniLibraryPath(RAVENWOOD_NATIVE_RUNTIME_NAME)); // Do the basic set up for the android sysprops. - RavenwoodSystemProperties.initialize(RAVENWOOD_BUILD_PROP); + RavenwoodSystemProperties.initialize(); setSystemProperties(null); // Do this after loading RAVENWOOD_NATIVE_RUNTIME_NAME (which backs Os.setenv()), |