Fix jni.h Analysis and include some extra headers.

diff --git a/Analysis.cpp b/Analysis.cpp
index 520de5404c3b9d3649ef566eca6ecd72866ad1b5..23fc5a3cc70553b89342ca5ab2fec2b44e173b53 100644 (file)
--- a/Analysis.cpp
+++ b/Analysis.cpp
@@ -37,7 +37,7 @@
 #include <sqlite3.h>
 
 #if CY_JAVA
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(__arm__)
 #include <JavaVM/jni.h>
 #else
 #include <jni.h>
@@ -66,6 +66,8 @@
 #include <CoreLocation/CoreLocation.h>
 #include <Security/Security.h>
 
+#include <dispatch/dispatch.h>
+
 #include <mach/mach.h>
 #include <mach/mach_vm.h>
 #include <mach/vm_map.h>
@@ -80,3 +82,7 @@ extern "C" UIApplication *UIApp;
 #include <AppKit/AppKit.h>
 #endif
 #endif
+
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif

diff --git a/Makefile.am b/Makefile.am
index f32b3bfe624c95a77efad1d39519de20379752f4..93a65603fb773ae7b216e11f146a8be321ba7adc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,13 +91,19 @@ libcycript.db: Bridge.def libcycript.py
 if CY_PRELINK
 CY_LANGFLAGS = -DCY_JAVA=$(CY_JAVA) -DCY_PYTHON=$(CY_PYTHON) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC)
 
+if CY_ANDROID
+CY_ANDFLAGS = -U__APPLE__ -D__ANDROID__
+else
+CY_ANDFLAGS = 
+endif
+
 CLEANFILES += Analyze
 Analyze: Analyze.cpp Error.cpp Output.cpp Replace.cpp Syntax.cpp
        $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) $(CY_LANGFLAGS) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses
 
 CLEANFILES += Bridge.def
 Bridge.def: Analysis.cpp Analyze
-       ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) >$@
+       ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) $(CY_ANDFLAGS) >$@
 else
 CLEANFILES += Bridge.def
 Bridge.def: Bridge.def.in

diff --git a/Makefile.in b/Makefile.in
index 7863ed5a24b4fd9dc138db003c094133c1379a59..274ab82c45abb14122f95945f32b7ad92145d3b4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -634,6 +634,8 @@ filters = $(am__append_9) $(am__append_13) $(am__append_17) \
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@cycript_pie_SOURCES = pie.c
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@cycript_pie_LDFLAGS = -fno-PIE
 @CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@CY_LANGFLAGS = -DCY_JAVA=$(CY_JAVA) -DCY_PYTHON=$(CY_PYTHON) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC)
+@CY_ANDROID_FALSE@@CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@CY_ANDFLAGS = 
+@CY_ANDROID_TRUE@@CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@CY_ANDFLAGS = -U__APPLE__ -D__ANDROID__
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -1429,7 +1431,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-datDATA \
 @CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@Analyze: Analyze.cpp Error.cpp Output.cpp Replace.cpp Syntax.cpp
 @CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@     $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) $(CY_LANGFLAGS) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses
 @CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@Bridge.def: Analysis.cpp Analyze
-@CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@     ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) >$@
+@CY_EXECUTE_TRUE@@CY_PRELINK_TRUE@     ./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) $(CY_ANDFLAGS) >$@
 @CY_EXECUTE_TRUE@@CY_PRELINK_FALSE@Bridge.def: Bridge.def.in
 @CY_EXECUTE_TRUE@@CY_PRELINK_FALSE@    cat $< >$@
 @CY_JAVA_TRUE@Class/Cycript.class: Java/Cycript.java