From 745eb589234bac233ce62a612771b77eddbb3b89 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 22 Jul 2014 12:27:43 -0700
Subject: [PATCH] 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
---
 Android.mk                | 2 --
 jni/Android.mk            | 6 +++---
 jni_jpegstream/Android.mk | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Android.mk b/Android.mk
index 52d45ba6b..3d5663e6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,8 +41,6 @@ LOCAL_MULTILIB := 32
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under, jni)
-
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 
 # Use the following include to make gallery test apk
diff --git a/jni/Android.mk b/jni/Android.mk
index 37382e495..2d7a0c398 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)
diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 96cc7ec65..97d57eeba 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -12,14 +12,14 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/src \
                     external/jpeg
 
-LOCAL_SHARED_LIBRARIES := libjpeg liblog
+LOCAL_SHARED_LIBRARIES := libjpeg
 
 LOCAL_SDK_VERSION   := 9
 LOCAL_ARM_MODE := arm
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
 LOCAL_CPPFLAGS += $(JNI_CFLAGS)
-
+LOCAL_LDLIBS := -llog
 
 LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES     := \
-- 
2.11.0