summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-07-19 10:56:47 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-07-19 11:22:05 -0700
commit1be429dec24f5fabb34083b8d0c264661e33924e (patch)
tree31725af20c21280c6349ee3f41dd730388a84a14
parent184b3f93beff0e85afb7d4415519332adbcf4784 (diff)
downloadandroid_packages_apps_Snap-1be429dec24f5fabb34083b8d0c264661e33924e.tar.gz
android_packages_apps_Snap-1be429dec24f5fabb34083b8d0c264661e33924e.tar.bz2
android_packages_apps_Snap-1be429dec24f5fabb34083b8d0c264661e33924e.zip
Fix non-ARM builds - use the proper way to reference libraries
Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0
-rw-r--r--jni/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index a4fb844bd..e86ec8db0 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -9,10 +9,11 @@ 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
-LOCAL_LDFLAGS := -llog -lEGL
-
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjni_eglfence