Fix incorrect dependence on the system-built liblog.
Our previous Android.mk was incorrectly pulling in the latest liblog,
instead of linking dynamically against the older prebuilt liblog. This
causes problems due to the latest liblog using __android_fatal(), which
is a new function in bionic.
This change also updates our tests to use the checked-in prebuilt liblog.so
instead of the system-built liblog.
Change-Id: I211ef3a31f033e66d46c619d89d507ea65ec3731
diff --git a/cpp/Android.mk b/cpp/Android.mk
index c6be6e4..d0f42aa 100644
--- a/cpp/Android.mk
+++ b/cpp/Android.mk
@@ -60,13 +60,9 @@
LOCAL_SRC_FILES += ../rsCompatibilityLib.cpp
LOCAL_WHOLE_STATIC_LIBRARIES := \
- libz \
libutils \
- liblog \
libstlport_static
-LOCAL_SHARED_LIBRARIES := libdl
-
LOCAL_MODULE:= libRScpp_static
LOCAL_MODULE_TAGS := optional
@@ -74,6 +70,7 @@
LOCAL_C_INCLUDES += frameworks/rs
LOCAL_C_INCLUDES += $(intermediates)
+LOCAL_LDFLAGS := -llog -lz -ldl
LOCAL_NDK_STL_VARIANT := stlport_static
include $(BUILD_STATIC_LIBRARY)