Fix issue #1015

Make 'cocotron' default Objective-C backend Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
crystax · Aug 28, 2015 · 19bd0a0 · 19bd0a0
1 parent 94fb51f
commit 19bd0a0
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 10 deletions.
diff --git a/build/core/add-application.mk b/build/core/add-application.mk
@@ -290,7 +290,7 @@ endif
 $(call ndk_log,Using APP_LIBCRYSTAX: $(APP_LIBCRYSTAX))
 
 ifndef APP_OBJC
-    APP_OBJC := $(DEFAULT_LIBOBJC)_shared
+    APP_OBJC := $(DEFAULT_LIBOBJC)$(if $(filter gnuobjc,$(DEFAULT_LIBOBJC)),_shared)
 else
     APP_OBJC := $(strip $(APP_OBJC))
     $(call ndk-objc-check,$(APP_OBJC))

diff --git a/build/core/defaults.mk b/build/core/defaults.mk
@@ -1,3 +1,3 @@
 DEFAULT_CXX_STANDARD := gnu++11
 DEFAULT_LIBSTDCXX    := gnustl
-DEFAULT_LIBOBJC      := gnuobjc
+DEFAULT_LIBOBJC      := cocotron
diff --git a/tests/device/crystax-test-objc/common.mk → ...ice/crystax-test-gnuobjc_shared/common.mk b/tests/device/crystax-test-objc/common.mk → ...ice/crystax-test-gnuobjc_shared/common.mk
diff --git a/.../device/crystax-test-objc/host/.gitignore → ...ystax-test-gnuobjc_shared/host/.gitignore b/.../device/crystax-test-objc/host/.gitignore → ...ystax-test-gnuobjc_shared/host/.gitignore
diff --git a/...device/crystax-test-objc/host/GNUmakefile → ...stax-test-gnuobjc_shared/host/GNUmakefile b/...device/crystax-test-objc/host/GNUmakefile → ...stax-test-gnuobjc_shared/host/GNUmakefile
diff --git a/...s/device/crystax-test-objc/jni/Android.mk → ...rystax-test-gnuobjc_shared/jni/Android.mk b/...s/device/crystax-test-objc/jni/Android.mk → ...rystax-test-gnuobjc_shared/jni/Android.mk
diff --git a/tests/device/crystax-test-gnuobjc_shared/jni/Application.mk b/tests/device/crystax-test-gnuobjc_shared/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_ABI := all
+APP_OBJC := gnuobjc_shared
diff --git a/tests/device/crystax-test-objc/jni/base.h → ...ce/crystax-test-gnuobjc_shared/jni/base.h b/tests/device/crystax-test-objc/jni/base.h → ...ce/crystax-test-gnuobjc_shared/jni/base.h
diff --git a/tests/device/crystax-test-objc/jni/base.m → ...ce/crystax-test-gnuobjc_shared/jni/base.m b/tests/device/crystax-test-objc/jni/base.m → ...ce/crystax-test-gnuobjc_shared/jni/base.m
diff --git a/tests/device/crystax-test-objc/jni/main.c → ...ce/crystax-test-gnuobjc_shared/jni/main.c b/tests/device/crystax-test-objc/jni/main.c → ...ce/crystax-test-gnuobjc_shared/jni/main.c
diff --git a/...ax-test-objc/jni/test-dlopen-libgnuobjc.c → ...uobjc_shared/jni/test-dlopen-libgnuobjc.c b/...ax-test-objc/jni/test-dlopen-libgnuobjc.c → ...uobjc_shared/jni/test-dlopen-libgnuobjc.c
@@ -6,7 +6,7 @@ int main()
     const char *plib = "libgnuobjc_shared.so";
 
     if (!dlopen(plib, RTLD_NOW)) {
-        char *err = dlerror();
+        const char *err = dlerror();
         printf("dlopen(\"%s\") FAILED: %s\n", plib, err);
         return 1;
     }

diff --git a/...vice/crystax-test-objc/jni/test-objc++.mm → ...ax-test-gnuobjc_shared/jni/test-objc++.mm b/...vice/crystax-test-objc/jni/test-objc++.mm → ...ax-test-gnuobjc_shared/jni/test-objc++.mm
diff --git a/.../device/crystax-test-objc/jni/test-objc.m → ...ystax-test-gnuobjc_shared/jni/test-objc.m b/.../device/crystax-test-objc/jni/test-objc.m → ...ystax-test-gnuobjc_shared/jni/test-objc.m
diff --git a/tests/device/crystax-test-objc-blocks/jni/Application.mk b/tests/device/crystax-test-objc-blocks/jni/Application.mk
@@ -1 +1,2 @@
 APP_ABI := all
+APP_OBJC := none
diff --git a/tests/device/crystax-test-objc-blocks/properties.json b/tests/device/crystax-test-objc-blocks/properties.json
diff --git a/tests/device/crystax-test-objc-cocotron/jni/Application.mk b/tests/device/crystax-test-objc-cocotron/jni/Application.mk
@@ -1,2 +1 @@
-APP_ABI := armeabi-v7a armeabi-v7a-hard mips x86 x86_64
-APP_OBJC := cocotron
+APP_ABI := all
diff --git a/tests/device/crystax-test-objc/jni/Application.mk b/tests/device/crystax-test-objc/jni/Application.mk