mirror of
https://github.com/corda/corda.git
synced 2025-01-01 02:36:44 +00:00
a couple of tweaks to get Mac/Android tests passing
This commit is contained in:
parent
58cbf5face
commit
6e209e2925
5
makefile
5
makefile
@ -236,10 +236,10 @@ ifneq ($(android),)
|
||||
-DJNI_JARJAR_PREFIX= \
|
||||
-D__DARWIN_UNIX03=1 \
|
||||
-D__PROVIDE_FIXMES \
|
||||
-DHAVE_OFF64_T \
|
||||
-DSTATIC_LIB \
|
||||
-g3 \
|
||||
-Werror
|
||||
-Werror \
|
||||
-Wno-shift-count-overflow
|
||||
|
||||
luni-cpps := $(shell find $(luni-native) -name '*.cpp')
|
||||
|
||||
@ -285,6 +285,7 @@ ifneq ($(android),)
|
||||
-lstdc++
|
||||
|
||||
ifeq ($(platform),linux)
|
||||
android-cflags += -DHAVE_OFF64_T
|
||||
classpath-lflags += -lrt
|
||||
endif
|
||||
|
||||
|
@ -254,13 +254,14 @@ class MyClasspath : public Classpath {
|
||||
{
|
||||
// force monitor creation so we don't get an OutOfMemory error
|
||||
// later when we try to acquire it:
|
||||
objectMonitor(t, t->javaThread, true);
|
||||
objectMonitor(t, t->javaThread->lock(), true);
|
||||
|
||||
THREAD_RESOURCE0(t, {
|
||||
vm::acquire(t, t->javaThread);
|
||||
vm::acquire(t, t->javaThread->lock());
|
||||
t->clearFlag(Thread::ActiveFlag);
|
||||
vm::notifyAll(t, t->javaThread);
|
||||
vm::release(t, t->javaThread);
|
||||
t->javaThread->peer() = 0;
|
||||
vm::notifyAll(t, t->javaThread->lock());
|
||||
vm::release(t, t->javaThread->lock());
|
||||
});
|
||||
|
||||
GcMethod* method = resolveMethod(
|
||||
|
Loading…
Reference in New Issue
Block a user