summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/137-cfi/run4
-rwxr-xr-xtest/etc/run-test-jar4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/137-cfi/run b/test/137-cfi/run
index 78cf2aaf8d..ecbbbc7c48 100755
--- a/test/137-cfi/run
+++ b/test/137-cfi/run
@@ -14,8 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Temporarily disable address space layout randomization (ASLR).
-# This is need on host so that the linker loads core.oat at fixed address.
-export LD_USE_LOAD_BIAS=1
-
exec ${RUN} "$@"
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 09841bfcec..cf6be83d6e 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -409,6 +409,10 @@ else
export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/lib"
export PATH="$PATH:${ANDROID_ROOT}/bin"
+ # Temporarily disable address space layout randomization (ASLR).
+ # This is needed on the host so that the linker loads core.oat at the necessary address.
+ export LD_USE_LOAD_BIAS=1
+
cmdline="$dalvikvm_cmdline"
if [ "$TIME_OUT" = "y" ]; then