commit c5e4b50511dcc560623d4e0292a694739394f2b9
author Dan Albert <danalbert@google.com> Fri Sep 26 20:38:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 26 20:38:21 2014 +0000
tree 51aa70bb9e74bcc7cd902171a4606a73e9f7a527
parent 0956427aa995561acb4471764158ae057a36dad5
parent fc1ae3a192abc1e340f5de90e88c2460121f013f

Merge "Don't manually link stlport."

Android.mk

diff --git a/Android.mk b/Android.mk
index 5b0680b..e8c91b3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SRC_FILES := \
 	src/main.cc \
@@ -15,18 +16,12 @@
 	src/queue.cc \
 	src/sat.cc \
 	src/sat_factory.cc \
-	src/worker.cc
+	src/worker.cc \
+
 LOCAL_MODULE:= stressapptest
 LOCAL_MODULE_TAGS := optional
-
 LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DNDEBUG -UDEBUG -DCHECKOPTS
-
-LOCAL_C_INCLUDES := \
-	bionic \
-	external/stlport/stlport
-
 LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SHARED_LIBRARIES := libc libstlport
+LOCAL_CXX_STL := stlport
 
 include $(BUILD_EXECUTABLE)