diff options
author | Dan Albert <danalbert@google.com> | 2014-09-26 20:38:20 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 20:38:21 +0000 |
commit | c5e4b50511dcc560623d4e0292a694739394f2b9 (patch) | |
tree | 51aa70bb9e74bcc7cd902171a4606a73e9f7a527 | |
parent | 0956427aa995561acb4471764158ae057a36dad5 (diff) | |
parent | fc1ae3a192abc1e340f5de90e88c2460121f013f (diff) | |
download | stressapptest-c5e4b50511dcc560623d4e0292a694739394f2b9.tar.gz |
Merge "Don't manually link stlport."android-wear-5.0.0_r1android-o-iot-preview-5android-l-preview_r2o-iot-preview-5lollipop-wear-releasel-preview
-rw-r--r-- | Android.mk | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -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) |