Merge "Fix incorrect dependence on the system-built liblog."
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)
diff --git a/tests/cppallocation/Android.mk b/tests/cppallocation/Android.mk
index ab47022..2e46c9e 100644
--- a/tests/cppallocation/Android.mk
+++ b/tests/cppallocation/Android.mk
@@ -9,8 +9,7 @@
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-	libRScpp_static \
-	libstlport_static
+	libRScpp_static
 
 LOCAL_LDFLAGS += -llog -ldl
 
diff --git a/tests/cppbasic/Android.mk b/tests/cppbasic/Android.mk
index e189d38..d4f7441 100644
--- a/tests/cppbasic/Android.mk
+++ b/tests/cppbasic/Android.mk
@@ -9,8 +9,7 @@
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-	libRScpp_static \
-	libstlport_static
+	libRScpp_static
 
 LOCAL_LDFLAGS += -llog -ldl
 
diff --git a/tests/cppstrided/Android.mk b/tests/cppstrided/Android.mk
index 05b87af..9fb98a6 100644
--- a/tests/cppstrided/Android.mk
+++ b/tests/cppstrided/Android.mk
@@ -9,8 +9,7 @@
 	compute.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-	libRScpp_static \
-	libstlport_static
+	libRScpp_static
 
 LOCAL_LDFLAGS += -llog -ldl
 
diff --git a/tests/latency/Android.mk b/tests/latency/Android.mk
index a6a8047..fdfa208 100644
--- a/tests/latency/Android.mk
+++ b/tests/latency/Android.mk
@@ -9,8 +9,7 @@
 	latency.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-	libRScpp_static \
-	libstlport_static
+	libRScpp_static
 
 LOCAL_LDFLAGS += -llog -ldl
 
diff --git a/tests/typecheck/Android.mk b/tests/typecheck/Android.mk
index b9606b8..c34e3e2 100644
--- a/tests/typecheck/Android.mk
+++ b/tests/typecheck/Android.mk
@@ -9,8 +9,7 @@
 	typecheck.cpp
 
 LOCAL_STATIC_LIBRARIES := \
-	libRScpp_static \
-	libstlport_static
+	libRScpp_static
 
 LOCAL_LDFLAGS += -llog -ldl