summaryrefslogtreecommitdiff
path: root/tests/memtest
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-09-12 10:46:30 -0700
committerDan Albert <danalbert@google.com>2014-09-12 10:46:30 -0700
commitcaacf4e89793e6a929b1165f9616c5f6d1a03f25 (patch)
tree187f327f1ae183178ad1320e9f2e8c7100f98cd9 /tests/memtest
parenta64e3c55546f4d94c55f35e341a886c1dfab9e47 (diff)
downloadextras-caacf4e89793e6a929b1165f9616c5f6d1a03f25.tar.gz
Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers. Change-Id: I0762ada6a759bcbb9b1d40f8bfd2255949da860d
Diffstat (limited to 'tests/memtest')
-rw-r--r--tests/memtest/Android.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
index 8e2d3f00..94476ceb 100644
--- a/tests/memtest/Android.mk
+++ b/tests/memtest/Android.mk
@@ -2,6 +2,7 @@
ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= \
memtest.cpp.arm \
@@ -9,16 +10,10 @@ LOCAL_SRC_FILES:= \
thumb.cpp \
bandwidth.cpp \
-
-LOCAL_SHARED_LIBRARIES := libc libstlport
-
LOCAL_MODULE:= memtest
-
LOCAL_MODULE_TAGS := optional
-
-## LOCAL_CFLAGS += -fstack-protector-all
LOCAL_CFLAGS += -fomit-frame-pointer
-LOCAL_C_INCLUDES += bionic external/stlport/stlport
+include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
endif