diff options
author | 2019-10-21 23:23:49 +0000 | |
---|---|---|
committer | 2019-10-21 23:23:49 +0000 | |
commit | 90dfd6b00928209a2ca4cf067df496b65e39d44a (patch) | |
tree | 86c5faed435fd7a79ecee2be1c0f3292b579e1bb | |
parent | ca0f14ec1abec029b46d549ec7dcf3001c114f5e (diff) | |
parent | 9a1c86dd4bb7cbb669061ecc66d4d11b12dd7a60 (diff) |
Merge "Use phenotype properties for boot image profile test"
-rw-r--r-- | tests/BootImageProfileTest/AndroidTest.xml | 4 | ||||
-rw-r--r-- | tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/BootImageProfileTest/AndroidTest.xml b/tests/BootImageProfileTest/AndroidTest.xml index c13200778c4b..b4f2663585cc 100644 --- a/tests/BootImageProfileTest/AndroidTest.xml +++ b/tests/BootImageProfileTest/AndroidTest.xml @@ -22,8 +22,8 @@ <!-- we need this magic flag, otherwise it always reboots and breaks the selinux --> <option name="force-skip-system-props" value="true" /> - <option name="run-command" value="setprop dalvik.vm.profilesystemserver true" /> - <option name="run-command" value="setprop dalvik.vm.profilebootclasspath true" /> + <option name="run-command" value="device_config put runtime_native_boot profilesystemserver true" /> + <option name="run-command" value="device_config put runtime_native_boot profilebootclasspath true" /> <!-- Profiling does not pick up the above changes we restart the shell --> <option name="run-command" value="stop" /> diff --git a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java index fe1d9d26c7e7..ccdd452b3f1e 100644 --- a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java +++ b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java @@ -46,9 +46,11 @@ public class BootImageProfileTest implements IDeviceTest { */ @Test public void testProperties() throws Exception { - String res = mTestDevice.getProperty("dalvik.vm.profilebootclasspath"); + String res = mTestDevice.getProperty( + "persist.device_config.runtime_native_boot.profilebootclasspath"); assertTrue("profile boot class path not enabled", res != null && res.equals("true")); - res = mTestDevice.getProperty("dalvik.vm.profilesystemserver"); + res = mTestDevice.getProperty( + "persist.device_config.runtime_native_boot.profilesystemserver"); assertTrue("profile system server not enabled", res != null && res.equals("true")); } |