diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-05-23 14:58:30 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-24 18:28:48 +0100 |
| commit | 13bea1fd3df96f0554335789395121ba715ba15e (patch) | |
| tree | ac6ca23b84f03a7ef993152ea9419b5d268a98b7 /android | |
| parent | 0c6bc40564d4e15f2801266115e7a7a137451907 (diff) | |
| download | mupdf-13bea1fd3df96f0554335789395121ba715ba15e.tar.xz | |
Android: Update makefiles for new single lib V8 builds.
We have a new method of making V8 libs for android that results
in a single lib rather than 2, and works on armeabi and x86 as
well as armeabi-v7a.
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/Android.mk | 11 | ||||
| -rw-r--r-- | android/jni/Core.mk | 5 |
2 files changed, 2 insertions, 14 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index af28d173..2391e161 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -7,13 +7,6 @@ ifdef NDK_PROFILER include android-ndk-profiler.mk endif -V8_OK := 0 -ifdef V8_BUILD -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) -V8_OK := 1 -endif -endif - include $(TOP_LOCAL_PATH)/Core2.mk include $(TOP_LOCAL_PATH)/Core.mk include $(TOP_LOCAL_PATH)/ThirdParty.mk @@ -35,8 +28,8 @@ else endif LOCAL_LDLIBS := -lm -llog -ljnigraphics -ifeq ($(V8_OK),1) -LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/v8-3.9/android -lv8_base -lv8_snapshot +ifdef V8_BUILD +LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/v8-3.9/android -lv8_$(TARGET_ARCH_ABI) endif include $(BUILD_SHARED_LIBRARY) diff --git a/android/jni/Core.mk b/android/jni/Core.mk index 73e6a08c..9fa6d060 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -154,7 +154,6 @@ ifdef MEMENTO LOCAL_SRC_FILES += $(MY_ROOT)/fitz/memento.c endif ifdef V8_BUILD -ifeq ($(V8_OK),1) LOCAL_SRC_FILES += \ $(MY_ROOT)/pdf/pdf_js.c \ $(MY_ROOT)/pdf/pdf_jsimp_cpp.c \ @@ -163,10 +162,6 @@ else LOCAL_SRC_FILES += \ $(MY_ROOT)/pdf/pdf_js_none.c endif -else -LOCAL_SRC_FILES += \ - $(MY_ROOT)/pdf/pdf_js_none.c -endif LOCAL_LDLIBS := -lm -llog -ljnigraphics |