From 82131246a46ed4547c978b0081d4e0db9d6f3942 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Fri, 21 Jun 2013 15:16:39 +0100 Subject: 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. --- platform/android/jni/Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'platform/android/jni/Android.mk') 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 -- cgit v1.2.3