diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-07-18 16:40:14 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-07-23 09:59:16 -0700 |
commit | 7c3884646bd55993c2488007b6a9e9d6f13f0297 (patch) | |
tree | ebed3dfea454b5bbd5d419ce01c34becde062bf8 /jni | |
parent | 1be429dec24f5fabb34083b8d0c264661e33924e (diff) | |
download | android_packages_apps_Snap-7c3884646bd55993c2488007b6a9e9d6f13f0297.tar.gz android_packages_apps_Snap-7c3884646bd55993c2488007b6a9e9d6f13f0297.tar.bz2 android_packages_apps_Snap-7c3884646bd55993c2488007b6a9e9d6f13f0297.zip |
Fixed x86 build
NDK supports x86 from r6. Without setting correct LOCAL_NDK_VERSION
build may fail to add library path for "-llog" and "-lEGL"
Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d
Diffstat (limited to 'jni')
-rw-r--r-- | jni/Android.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index e86ec8db0..593074f6f 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -9,11 +9,15 @@ LOCAL_SRC_FILES := jni_egl_fence.cpp ifeq ($(TARGET_ARCH), arm) LOCAL_NDK_VERSION := 5 LOCAL_SDK_VERSION := 9 - LOCAL_LDFLAGS := -llog -lEGL -else - LOCAL_SHARED_LIBRARIES := liblog libEGL endif +ifeq ($(TARGET_ARCH), x86) + LOCAL_NDK_VERSION := 6 + LOCAL_SDK_VERSION := 9 +endif + +LOCAL_LDFLAGS := -llog -lEGL + LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjni_eglfence |