diff options
| author | 2019-10-21 17:16:06 -0700 | |
|---|---|---|
| committer | 2019-10-21 17:16:06 -0700 | |
| commit | d590c3886bf517ac3067718fd7fe7166cda2b6e7 (patch) | |
| tree | 897039467e9c7745a60b8fdbbdb73b50bac6cbd7 | |
| parent | d7317011827bf1a22a0ae3f25fe9f2580f87816b (diff) | |
| parent | 789d0737ac8f0f91ebac2062e05dd5a3d63b024d (diff) | |
Merge "Use phenotype properties for boot image profile test" am: 90dfd6b009 am: 06792d7c5c am: 96fb70cc75
am: 789d0737ac
Change-Id: Ib7359ab34acecd5c8823df9087703eb5553caeba
| -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")); } |