commit a9b60a876879cc62c6f0f8e299db1a2c3acf77a6
author Narayan Kamath <narayan@google.com> Wed Sep 02 13:26:54 2015 +0100
committer Narayan Kamath <narayan@google.com> Thu Sep 03 09:59:51 2015 +0000
tree 3cdd98db72cbbb553df72d8b7ec2eb027e4ffa32
parent 7ad1d752ba4a1a19c401e5ff1ec1e64fbe95b5a1

File: Test file-system encodings of files.

We must use UTF-8 and not modified UTF-8.

bug: 23523042
Change-Id: I24fe6e2653ee8876c603776b835c91804826724c

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index 379a1cb..44bc511 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -71,6 +71,7 @@
 
 core_test_files := \
   luni/src/test/native/dalvik_system_JniTest.cpp \
+  luni/src/test/native/libcore_java_io_FileTest.cpp \
 
 #
 # Build for the target (device).
@@ -97,7 +98,7 @@
 LOCAL_CPPFLAGS += $(core_cppflags)
 LOCAL_SRC_FILES += $(core_test_files)
 LOCAL_C_INCLUDES += libcore/include
-LOCAL_SHARED_LIBRARIES += libcrypto
+LOCAL_SHARED_LIBRARIES += libcrypto libnativehelper
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libjavacoretests
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
@@ -176,7 +177,7 @@
     LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := libjavacoretests
     LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
-    LOCAL_SHARED_LIBRARIES := libcrypto-host
+    LOCAL_SHARED_LIBRARIES := libcrypto-host libnativehelper
     LOCAL_MULTILIB := both
     LOCAL_CXX_STL := libc++
     include $(BUILD_HOST_SHARED_LIBRARY)