Fix Android builds.

Had to rejig the thumb entry/exit veneers to allow for NDK_PROFILER
operation, but this seems to have negated the need for Core2.mk, so
removed that here.

5 files changed, 44 insertions, 189 deletions

diff --git a/platform/android/jni/Android.mk b/platform/android/jni/Android.mk
index 2391e161..17389efc 100644
--- a/platform/android/jni/Android.mk
+++ b/platform/android/jni/Android.mk
@@ -1,22 +1,22 @@
 LOCAL_PATH := $(call my-dir)
 TOP_LOCAL_PATH := $(LOCAL_PATH)
 
-MUPDF_ROOT := ..
+MUPDF_ROOT := ../..
 
 ifdef NDK_PROFILER
 include android-ndk-profiler.mk
 endif
 
-include $(TOP_LOCAL_PATH)/Core2.mk
 include $(TOP_LOCAL_PATH)/Core.mk
 include $(TOP_LOCAL_PATH)/ThirdParty.mk
 
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES := \
-	$(MUPDF_ROOT)/draw \
-	$(MUPDF_ROOT)/fitz \
-	$(MUPDF_ROOT)/pdf
+	jni/andprof \
+	$(MUPDF_ROOT)/include \
+	$(MUPDF_ROOT)/source/fitz \
+	$(MUPDF_ROOT)/source/pdf
 LOCAL_CFLAGS :=
 LOCAL_MODULE    := mupdf
 LOCAL_SRC_FILES := mupdf.c
diff --git a/platform/android/jni/Application.mk b/platform/android/jni/Application.mk
index 8eb9c3b9..60909b6e 100644
--- a/platform/android/jni/Application.mk
+++ b/platform/android/jni/Application.mk
@@ -24,13 +24,9 @@ APP_ABI := armeabi-v7a
 ifdef NDK_PROFILER
 # The profiler doesn't seem to receive ticks when run on release code.
 # Accordingly, we need to build as debug - but this turns optimisations
-# off, which is less than ideal. We COULD force them back on by using
-# APP_CFLAGS = -O2, but this then triggers bugs in the compiler when it
-# builds a couple of our source files. Accordingly, we have moved
-# those files into Core2, and we have some flag hackery to make just that
-# module without optimisation.
+# off, which is less than ideal.
 APP_OPTIM := debug
-APP_CFLAGS :=
+APP_CFLAGS := -O2
 else
 APP_OPTIM := release
 endif
diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk
index f53f679a..727e9584 100644
--- a/platform/android/jni/Core.mk
+++ b/platform/android/jni/Core.mk
@@ -9,7 +9,7 @@ V8 := v8-3.9
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED
 ifdef NDK_PROFILER
-LOCAL_CFLAGS += -pg -DNDK_PROFILER -O2
+LOCAL_CFLAGS += -pg -DNDK_PROFILER
 endif
 endif
 LOCAL_CFLAGS += -DAA_BITS=8
@@ -18,145 +18,47 @@ LOCAL_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY
 endif
 
 LOCAL_C_INCLUDES := \
-	../thirdparty/jbig2dec \
-	../thirdparty/openjpeg/src/lib/openjp2 \
-	../thirdparty/jpeg \
-	../thirdparty/zlib \
-	../thirdparty/freetype/include \
-	../draw \
-	../fitz \
-	../pdf \
-	../xps \
-	../cbz \
-	../ucdn \
-	../scripts \
-	..
+	../../thirdparty/jbig2dec \
+	../../thirdparty/openjpeg/src/lib/openjp2 \
+	../../thirdparty/jpeg \
+	../../thirdparty/zlib \
+	../../thirdparty/freetype/include \
+	../../source/fitz \
+	../../source/pdf \
+	../../source/xps \
+	../../source/cbz \
+	../../source/img \
+	../../scripts \
+	../../generated \
+	../../resources \
+	../../include \
+	../..
 ifdef V8_BUILD
-LOCAL_C_INCLUDES += ../thirdparty/$(V8)/include
+LOCAL_C_INCLUDES += ../../thirdparty/$(V8)/include
 endif
 
 LOCAL_MODULE    := mupdfcore
 LOCAL_SRC_FILES := \
-	$(MY_ROOT)/fitz/base_context.c \
-	$(MY_ROOT)/fitz/base_error.c \
-	$(MY_ROOT)/fitz/base_geometry.c \
-	$(MY_ROOT)/fitz/base_getopt.c \
-	$(MY_ROOT)/fitz/base_hash.c \
-	$(MY_ROOT)/fitz/base_memory.c \
-	$(MY_ROOT)/fitz/base_string.c \
-	$(MY_ROOT)/fitz/base_time.c \
-	$(MY_ROOT)/fitz/base_xml.c \
-	$(MY_ROOT)/fitz/crypt_aes.c \
-	$(MY_ROOT)/fitz/crypt_arc4.c \
-	$(MY_ROOT)/fitz/crypt_md5.c \
-	$(MY_ROOT)/fitz/crypt_sha2.c \
-	$(MY_ROOT)/fitz/dev_bbox.c \
-	$(MY_ROOT)/fitz/dev_list.c \
-	$(MY_ROOT)/fitz/dev_null.c \
-	$(MY_ROOT)/fitz/dev_trace.c \
-	$(MY_ROOT)/fitz/doc_document.c \
-	$(MY_ROOT)/fitz/doc_link.c \
-	$(MY_ROOT)/fitz/doc_outline.c \
-	$(MY_ROOT)/fitz/filt_basic.c \
-	$(MY_ROOT)/fitz/filt_dctd.c \
-	$(MY_ROOT)/fitz/filt_faxd.c \
-	$(MY_ROOT)/fitz/filt_flate.c \
-	$(MY_ROOT)/fitz/filt_jbig2d.c \
-	$(MY_ROOT)/fitz/filt_lzwd.c \
-	$(MY_ROOT)/fitz/filt_predict.c \
-	$(MY_ROOT)/fitz/image_jpx.c \
-	$(MY_ROOT)/fitz/image_jpeg.c \
-	$(MY_ROOT)/fitz/image_png.c \
-	$(MY_ROOT)/fitz/image_tiff.c \
-	$(MY_ROOT)/fitz/res_colorspace.c \
-	$(MY_ROOT)/fitz/res_font.c \
-	$(MY_ROOT)/fitz/res_func.c \
-	$(MY_ROOT)/fitz/res_image.c \
-	$(MY_ROOT)/fitz/res_path.c \
-	$(MY_ROOT)/fitz/res_pixmap.c \
-	$(MY_ROOT)/fitz/res_store.c \
-	$(MY_ROOT)/fitz/res_text.c \
-	$(MY_ROOT)/fitz/stm_buffer.c \
-	$(MY_ROOT)/fitz/stm_comp_buf.c \
-	$(MY_ROOT)/fitz/stm_open.c \
-	$(MY_ROOT)/fitz/stm_output.c \
-	$(MY_ROOT)/fitz/stm_read.c \
-	$(MY_ROOT)/fitz/text_extract.c \
-	$(MY_ROOT)/fitz/text_output.c \
-	$(MY_ROOT)/fitz/text_paragraph.c \
-	$(MY_ROOT)/fitz/text_search.c \
-	$(MY_ROOT)/draw/draw_affine.c \
-	$(MY_ROOT)/draw/draw_blend.c \
-	$(MY_ROOT)/draw/draw_device.c \
-	$(MY_ROOT)/draw/draw_edge.c \
-	$(MY_ROOT)/draw/draw_glyph.c \
-	$(MY_ROOT)/draw/draw_mesh.c \
-	$(MY_ROOT)/draw/draw_paint.c \
-	$(MY_ROOT)/draw/draw_path.c \
-	$(MY_ROOT)/draw/draw_simple_scale.c \
-	$(MY_ROOT)/draw/draw_unpack.c \
-	$(MY_ROOT)/ucdn/ucdn.c \
-	$(MY_ROOT)/pdf/pdf_annot.c \
-	$(MY_ROOT)/pdf/pdf_cmap.c \
-	$(MY_ROOT)/pdf/pdf_cmap_load.c \
-	$(MY_ROOT)/pdf/pdf_cmap_parse.c \
-	$(MY_ROOT)/pdf/pdf_cmap_table.c \
-	$(MY_ROOT)/pdf/pdf_colorspace.c \
-	$(MY_ROOT)/pdf/pdf_crypt.c \
-	$(MY_ROOT)/pdf/pdf_device.c \
-	$(MY_ROOT)/pdf/pdf_encoding.c \
-	$(MY_ROOT)/pdf/pdf_event.c \
-	$(MY_ROOT)/pdf/pdf_field.c \
-	$(MY_ROOT)/pdf/pdf_font.c \
-	$(MY_ROOT)/pdf/pdf_fontfile.c \
-	$(MY_ROOT)/pdf/pdf_form.c \
-	$(MY_ROOT)/pdf/pdf_function.c \
-	$(MY_ROOT)/pdf/pdf_image.c \
-	$(MY_ROOT)/pdf/pdf_interpret.c \
-	$(MY_ROOT)/pdf/pdf_lex.c \
-	$(MY_ROOT)/pdf/pdf_metrics.c \
-	$(MY_ROOT)/pdf/pdf_nametree.c \
-	$(MY_ROOT)/pdf/pdf_object.c \
-	$(MY_ROOT)/pdf/pdf_outline.c \
-	$(MY_ROOT)/pdf/pdf_page.c \
-	$(MY_ROOT)/pdf/pdf_parse.c \
-	$(MY_ROOT)/pdf/pdf_pattern.c \
-	$(MY_ROOT)/pdf/pdf_repair.c \
-	$(MY_ROOT)/pdf/pdf_shade.c \
-	$(MY_ROOT)/pdf/pdf_stream.c \
-	$(MY_ROOT)/pdf/pdf_store.c \
-	$(MY_ROOT)/pdf/pdf_type3.c \
-	$(MY_ROOT)/pdf/pdf_unicode.c \
-	$(MY_ROOT)/pdf/pdf_write.c \
-	$(MY_ROOT)/pdf/pdf_xobject.c \
-	$(MY_ROOT)/pdf/pdf_xref.c \
-	$(MY_ROOT)/pdf/pdf_xref_aux.c \
-	$(MY_ROOT)/xps/xps_common.c \
-	$(MY_ROOT)/xps/xps_doc.c \
-	$(MY_ROOT)/xps/xps_glyphs.c \
-	$(MY_ROOT)/xps/xps_gradient.c \
-	$(MY_ROOT)/xps/xps_image.c \
-	$(MY_ROOT)/xps/xps_outline.c \
-	$(MY_ROOT)/xps/xps_path.c \
-	$(MY_ROOT)/xps/xps_resource.c \
-	$(MY_ROOT)/xps/xps_tile.c \
-	$(MY_ROOT)/xps/xps_util.c \
-	$(MY_ROOT)/xps/xps_zip.c \
-	$(MY_ROOT)/cbz/mucbz.c \
-	$(MY_ROOT)/image/muimage.c
+	$(wildcard $(MY_ROOT)/source/fitz/*.c) \
+	$(wildcard $(MY_ROOT)/source/pdf/*.c) \
+	$(wildcard $(MY_ROOT)/source/xps/*.c) \
+	$(wildcard $(MY_ROOT)/source/cbz/*.c) \
+	$(wildcard $(MY_ROOT)/source/img/*.c)
 ifdef MEMENTO
-	LOCAL_SRC_FILES += $(MY_ROOT)/fitz/memento.c
+LOCAL_SRC_FILES += $(MY_ROOT)/fitz/memento.c
 endif
 ifdef V8_BUILD
 LOCAL_SRC_FILES += \
-	$(MY_ROOT)/pdf/pdf_js.c \
-	$(MY_ROOT)/pdf/pdf_jsimp_cpp.c \
-	$(MY_ROOT)/pdf/pdf_jsimp_v8.cpp
+	$(MY_ROOT)/source/pdf/js/pdf-js.c \
+	$(MY_ROOT)/source/pdf/js/pdf-jsimp-cpp.c \
+	$(MY_ROOT)/source/pdf/js/pdf-jsimp-v8.cpp
 else
 LOCAL_SRC_FILES += \
-	$(MY_ROOT)/pdf/pdf_js_none.c
+	$(MY_ROOT)/source/pdf/js/pdf-js-none.c
 endif
 
 LOCAL_LDLIBS    := -lm -llog -ljnigraphics
 
+LOCAL_SRC_FILES := $(addprefix ../, $(LOCAL_SRC_FILES))
+
 include $(BUILD_STATIC_LIBRARY)
diff --git a/platform/android/jni/Core2.mk b/platform/android/jni/Core2.mk
deleted file mode 100644
index b08751fe..00000000
--- a/platform/android/jni/Core2.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-MY_ROOT := ../..
-
-V8 := v8-3.9
-
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS += -DARCH_ARM -DARCH_THUMB -DARCH_ARM_CAN_LOAD_UNALIGNED
-ifdef NDK_PROFILER
-LOCAL_CFLAGS += -pg -DNDK_PROFILER -O0
-NDK_APP_CFLAGS :=
-endif
-endif
-LOCAL_CFLAGS += -DAA_BITS=8
-ifdef MEMENTO
-LOCAL_CFLAGS += -DMEMENTO -DMEMENTO_LEAKONLY
-endif
-
-LOCAL_C_INCLUDES := \
-	../thirdparty/jbig2dec \
-	../thirdparty/openjpeg/src/lib/openjp2 \
-	../thirdparty/jpeg \
-	../thirdparty/zlib \
-	../thirdparty/freetype/include \
-	../draw \
-	../fitz \
-	../pdf \
-	../xps \
-	../cbz \
-	../ucdn \
-	../scripts \
-	..
-ifdef V8_BUILD
-LOCAL_C_INCLUDES += ../thirdparty/$(V8)/include
-endif
-
-LOCAL_MODULE    := mupdfcore2
-LOCAL_SRC_FILES := \
-	$(MY_ROOT)/fitz/res_shade.c
-
-LOCAL_LDLIBS    := -lm -llog -ljnigraphics
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk
index 1a104b4b..e4cd3d67 100644
--- a/platform/android/jni/ThirdParty.mk
+++ b/platform/android/jni/ThirdParty.mk
@@ -5,12 +5,12 @@ include $(CLEAR_VARS)
 MY_ROOT := ../..
 
 LOCAL_C_INCLUDES := \
-	../thirdparty/jbig2dec \
-	../thirdparty/openjpeg/src/lib/openjp2 \
-	../thirdparty/jpeg \
-	../thirdparty/zlib \
-	../thirdparty/freetype/include \
-	../scripts
+	../../thirdparty/jbig2dec \
+	../../thirdparty/openjpeg/src/lib/openjp2 \
+	../../thirdparty/jpeg \
+	../../thirdparty/zlib \
+	../../thirdparty/freetype/include \
+	../../scripts
 
 LOCAL_CFLAGS := \
 	-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \
@@ -129,4 +129,6 @@ LOCAL_SRC_FILES := \
 	$(MY_ROOT)/thirdparty/freetype/src/truetype/truetype.c \
 	$(MY_ROOT)/thirdparty/freetype/src/type1/type1.c
 
+LOCAL_SRC_FILES := $(addprefix ../, $(LOCAL_SRC_FILES))
+
 include $(BUILD_STATIC_LIBRARY)