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

a couple of tweaks to get Mac/Android tests passing

Browse Source
This commit is contained in:
Joel Dice 2014-09-02 10:14:04 -06:00
parent 58cbf5face
commit 6e209e2925
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefile
View File

@ -236,10 +236,10 @@ ifneq ($(android),)
-DJNI_JARJAR_PREFIX= \ -DJNI_JARJAR_PREFIX= \
-D__DARWIN_UNIX03=1 \ -D__DARWIN_UNIX03=1 \
-D__PROVIDE_FIXMES \ -D__PROVIDE_FIXMES \
-DHAVE_OFF64_T \
-DSTATIC_LIB \ -DSTATIC_LIB \
-g3 \ -g3 \
-Werror -Werror \
-Wno-shift-count-overflow
luni-cpps := $(shell find $(luni-native) -name '*.cpp') luni-cpps := $(shell find $(luni-native) -name '*.cpp')
@ -285,6 +285,7 @@ ifneq ($(android),)
-lstdc++ -lstdc++
ifeq ($(platform),linux) ifeq ($(platform),linux)
android-cflags += -DHAVE_OFF64_T
classpath-lflags += -lrt classpath-lflags += -lrt
endif endif

9
src/classpath-android.cpp
View File

@ -254,13 +254,14 @@ class MyClasspath : public Classpath {
{ {
// force monitor creation so we don't get an OutOfMemory error // force monitor creation so we don't get an OutOfMemory error
// later when we try to acquire it: // later when we try to acquire it:
objectMonitor(t, t->javaThread, true); objectMonitor(t, t->javaThread->lock(), true);
THREAD_RESOURCE0(t, { THREAD_RESOURCE0(t, {
vm::acquire(t, t->javaThread); vm::acquire(t, t->javaThread->lock());
t->clearFlag(Thread::ActiveFlag); t->clearFlag(Thread::ActiveFlag);
vm::notifyAll(t, t->javaThread); t->javaThread->peer() = 0;
vm::release(t, t->javaThread); vm::notifyAll(t, t->javaThread->lock());
vm::release(t, t->javaThread->lock());
}); });
GcMethod* method = resolveMethod( GcMethod* method = resolveMethod(