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 | 4c8abc39a0974a062a1c1dbcebc085f7ebcd1736 (patch) | |
| tree | 2514dfd2bbdd0e2af02e556f6b8cdf38c85f9b8d /jni | |
| parent | 331bb4180d56f7cb1f88e919edd398709568dbfe (diff) | |
| download | android_packages_apps_Gallery2-4c8abc39a0974a062a1c1dbcebc085f7ebcd1736.tar.gz android_packages_apps_Gallery2-4c8abc39a0974a062a1c1dbcebc085f7ebcd1736.tar.bz2 android_packages_apps_Gallery2-4c8abc39a0974a062a1c1dbcebc085f7ebcd1736.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 |