From 51f01a2e2829dc59da4d0869e35aac6ba63a2cea Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 2 Dec 2015 23:00:20 +0000 Subject: [PATCH] Revert "Fix test path in libarttest.mk" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Test has flakes: +art F 30865 30865 art/runtime/java_vm_ext.cc:466] JNI DETECTED ERROR IN APPLICATION: input is not valid Modified UTF-8: illegal start byte 0x80 +art F 30865 30865 art/runtime/java_vm_ext.cc:466] string: '��gy�' +art F 30865 30865 art/runtime/java_vm_ext.cc:466] input: '<0x80> 0xd8 0x67 0x79 0x8e 0x7f' +art F 30865 30865 art/runtime/java_vm_ext.cc:466] in call to NewStringUTF +art F 30865 30865 art/runtime/java_vm_ext.cc:466] from java.lang.String Main.getProfileInfoDump(java.lang.String, java.lang.Class, java.lang.Class) This reverts commit 95f51a71d28be844e68fe3dda3ed0bba6b99f8ad. Change-Id: I32ae3ad8e2e6c4eed1d3f79e5498709c43afadcb --- test/Android.libarttest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk index f84dfe671..f8abe71be 100644 --- a/test/Android.libarttest.mk +++ b/test/Android.libarttest.mk @@ -39,7 +39,7 @@ LIBARTTEST_COMMON_SRC_FILES := \ 466-get-live-vreg/get_live_vreg_jni.cc \ 497-inlining-and-class-loader/clear_dex_cache.cc \ 543-env-long-ref/env_long_ref.cc \ - 554-jit-profile-file/offline_profile.cc + 551-jit-profile-file/offline_profile.cc ART_TARGET_LIBARTTEST_$(ART_PHONY_TEST_TARGET_SUFFIX) += $(ART_TARGET_TEST_OUT)/$(TARGET_ARCH)/libarttest.so ART_TARGET_LIBARTTEST_$(ART_PHONY_TEST_TARGET_SUFFIX) += $(ART_TARGET_TEST_OUT)/$(TARGET_ARCH)/libarttestd.so -- 2.11.0