aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-09-26 13:10:41 -0700
committerDan Albert <danalbert@google.com>2014-09-26 13:10:41 -0700
commitfc1ae3a192abc1e340f5de90e88c2460121f013f (patch)
tree51aa70bb9e74bcc7cd902171a4606a73e9f7a527
parent0956427aa995561acb4471764158ae057a36dad5 (diff)
downloadstressapptest-fc1ae3a192abc1e340f5de90e88c2460121f013f.tar.gz
Don't manually link stlport.
Change-Id: Iccc4128a4134651d2946e5fd4e50b90a501fb4e7
-rw-r--r--Android.mk13
1 files changed, 4 insertions, 9 deletions
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 @@ LOCAL_SRC_FILES := \
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)