From 143e8847e3b6e3783316d824f7e6b34e6b350f09 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 18 Jul 2012 16:40:14 -0700
Subject: 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
---
 jni/Android.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'jni/Android.mk')

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
-- 
cgit v1.2.3