diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-04-29 17:23:34 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-04-29 17:27:59 +0100 |
| commit | 1c296c7eb8cc2acab8ca3a4181f79e624d76c82d (patch) | |
| tree | 4fe4ad4a00e6e3ba9f78c1c3c80f897d339fbdde /android/jni | |
| parent | 8dc49c622e891cc6179b6444d66f97d3c572429a (diff) | |
| download | mupdf-1c296c7eb8cc2acab8ca3a4181f79e624d76c82d.tar.xz | |
Android: Fix the makefile (again) for v8 or not.
Eventually I will get this right.
Diffstat (limited to 'android/jni')
| -rw-r--r-- | android/jni/Android.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 3c6e3b77..af28d173 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -7,11 +7,10 @@ ifdef NDK_PROFILER include android-ndk-profiler.mk endif +V8_OK := 0 ifdef V8_BUILD -ifeq ($(TARGET_ARCH_ABI),"armeabi-v7a") +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) V8_OK := 1 -else -V8_OK := 0 endif endif @@ -36,10 +35,8 @@ else endif LOCAL_LDLIBS := -lm -llog -ljnigraphics -ifdef V8_BUILD -ifeq ($(TARGET_ARCH_ABI),"armeabi-v7a") +ifeq ($(V8_OK),1) LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/v8-3.9/android -lv8_base -lv8_snapshot endif -endif include $(BUILD_SHARED_LIBRARY) |