ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix for https://github.com/ReadyTalk/avian/issues/216

Browse Source
This commit is contained in:
Ilya Mizus 2014-04-04 20:21:16 +04:00
parent b52cbc21b2
commit 66edf1ff4a
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -163,7 +163,7 @@ ifneq ($(android),)
classpath-jar-dep = $(build)/android.dep classpath-jar-dep = $(build)/android.dep
luni-native = $(android)/libcore/luni/src/main/native luni-native = $(android)/libcore/luni/src/main/native
classpath-cflags = -DBOOT_JAVAHOME classpath-cflags = -DBOOT_JAVAHOME
android-cflags := -I$(luni-native) \ android-cflags = -I$(luni-native) \
-I$(android)/libnativehelper/include/nativehelper \ -I$(android)/libnativehelper/include/nativehelper \
-I$(android)/system/core/include \ -I$(android)/system/core/include \
-I$(android)/external/zlib \ -I$(android)/external/zlib \

16
src/classpath-android.cpp
View File

@ -2334,22 +2334,6 @@ Avian_java_lang_System_identityHashCode
return objectHash(t, reinterpret_cast<object>(arguments[0])); return objectHash(t, reinterpret_cast<object>(arguments[0]));
} }
extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_java_lang_System_mapLibraryName
(Thread* t, object, uintptr_t* arguments)
{
object original = reinterpret_cast<object>(arguments[0]);
unsigned originalLength = stringUTFLength(t, original);
THREAD_RUNTIME_ARRAY(t, char, originalChars, originalLength);
stringUTFChars
(t, original, RUNTIME_ARRAY_BODY(originalChars), originalLength);
return reinterpret_cast<uintptr_t>
(makeString(t, "%s%.*s%s", t->m->system->libraryPrefix(), originalLength,
RUNTIME_ARRAY_BODY(originalChars),
t->m->system->librarySuffix()));
}
extern "C" AVIAN_EXPORT int64_t JNICALL extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8 Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8
(Thread*, object, uintptr_t*) (Thread*, object, uintptr_t*)