diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-04-17 15:41:49 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-04-18 23:26:10 +0100 |
| commit | ed0ba506cf19d53339d614580fe77edf714a57e4 (patch) | |
| tree | 37a41ee8c5a56586cfcae5c2b5161bad94f18950 /android | |
| parent | e151d0a1d8e5d03e48f96a650210bc5942517f98 (diff) | |
| download | mupdf-ed0ba506cf19d53339d614580fe77edf714a57e4.tar.xz | |
Android: Fix V8_BUILD makefile logic.
V8_OK needs to be set before the includes. LOCAL_LDLIBS need to be set
after them.
Diffstat (limited to 'android')
| -rw-r--r-- | android/jni/Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index a6b3dcf9..3c6e3b77 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -7,6 +7,14 @@ ifdef NDK_PROFILER include android-ndk-profiler.mk endif +ifdef V8_BUILD +ifeq ($(TARGET_ARCH_ABI),"armeabi-v7a") +V8_OK := 1 +else +V8_OK := 0 +endif +endif + include $(TOP_LOCAL_PATH)/Core2.mk include $(TOP_LOCAL_PATH)/Core.mk include $(TOP_LOCAL_PATH)/ThirdParty.mk @@ -29,10 +37,7 @@ endif LOCAL_LDLIBS := -lm -llog -ljnigraphics ifdef V8_BUILD -ifeq ($(TARGET_ARCH_ABI),"armeabi") -V8_OK := 0 -else -V8_OK := 1 +ifeq ($(TARGET_ARCH_ABI),"armeabi-v7a") LOCAL_LDLIBS += -L$(MUPDF_ROOT)/thirdparty/v8-3.9/android -lv8_base -lv8_snapshot endif endif |