summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-07-22 19:27:43 (GMT)
committerYing Wang <wangying@google.com>2014-07-22 19:27:43 (GMT)
commit745eb589234bac233ce62a612771b77eddbb3b89 (patch)
treeef43b3b6de36acd9d8e57996a323fcd047e17d9d /jni
parentc0a5cca72283cafa469befcb45101f25a9eb69a2 (diff)
downloadandroid_packages_apps_Gallery2-745eb589234bac233ce62a612771b77eddbb3b89.zip
android_packages_apps_Gallery2-745eb589234bac233ce62a612771b77eddbb3b89.tar.gz
android_packages_apps_Gallery2-745eb589234bac233ce62a612771b77eddbb3b89.tar.bz2
Build against the NDK libraries.
That way you don't have dependency on the platform libraries, which in turn depends on things like libcompiler_rt-extras, which isn't exposed to apps_only build. Bug: 16398512 Change-Id: Ie7cf54c97c57b13e82c1891970eb3731a68ae075
Diffstat (limited to 'jni')
-rw-r--r--jni/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 37382e4..2d7a0c3 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -8,12 +8,12 @@ LOCAL_SRC_FILES := jni_egl_fence.cpp
LOCAL_SDK_VERSION := 9
-LOCAL_SHARED_LIBRARIES := liblog libEGL
-
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjni_eglfence
+LOCAL_LDLIBS := -llog -lEGL
+
include $(BUILD_SHARED_LIBRARY)
@@ -22,7 +22,6 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
-LOCAL_SHARED_LIBRARIES := liblog libjnigraphics
LOCAL_SDK_VERSION := 9
LOCAL_MODULE := libjni_filtershow_filters
LOCAL_SRC_FILES := filters/gradient.c \
@@ -46,6 +45,7 @@ LOCAL_SRC_FILES := filters/gradient.c \
filters/kmeans.cc
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_LDLIBS := -llog -ljnigraphics
LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY)