diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:16:39 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:23:36 +0100 |
| commit | 82131246a46ed4547c978b0081d4e0db9d6f3942 (patch) | |
| tree | debd12abf0e2f5c3ce977e3813db7c0f7238fa31 /platform/android/jni/Android.mk | |
| parent | e2673a829b61d77d7884ecabac2424fdb28309e8 (diff) | |
| download | mupdf-82131246a46ed4547c978b0081d4e0db9d6f3942.tar.xz | |
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.
Diffstat (limited to 'platform/android/jni/Android.mk')
| -rw-r--r-- | platform/android/jni/Android.mk | 10 |
1 files changed, 5 insertions, 5 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 |