Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers.
Change-Id: I0762ada6a759bcbb9b1d40f8bfd2255949da860d
diff --git a/memtrack/Android.mk b/memtrack/Android.mk
index 66759bb..22472ca 100644
--- a/memtrack/Android.mk
+++ b/memtrack/Android.mk
@@ -17,11 +17,8 @@
src_files := \
memtrack.cpp
-includes := \
- bionic \
- external/stlport/stlport \
-
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := $(src_files)
@@ -31,13 +28,13 @@
LOCAL_C_INCLUDES += $(includes)
LOCAL_SHARED_LIBRARIES := \
- libc \
- libstlport \
liblog \
+include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := $(src_files)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
@@ -45,11 +42,11 @@
LOCAL_MODULE := memtrack
LOCAL_FORCE_STATIC_EXECUTABLE := true
-LOCAL_C_INCLUDES += $(includes)
LOCAL_STATIC_LIBRARIES := \
libc \
libstdc++ \
libstlport_static \
liblog \
+include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
diff --git a/tests/binder/benchmarks/Android.mk b/tests/binder/benchmarks/Android.mk
index 8680f4d..c0ddb47 100644
--- a/tests/binder/benchmarks/Android.mk
+++ b/tests/binder/benchmarks/Android.mk
@@ -17,28 +17,25 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
LOCAL_MODULE_TAGS := eng tests
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativebenchmark
LOCAL_STATIC_LIBRARIES += \
- libgtest \
- libgtest_main \
libtestUtil
LOCAL_SHARED_LIBRARIES += \
libutils \
liblog \
- libstlport \
libbinder
LOCAL_C_INCLUDES += \
- bionic \
- bionic/libstdc++/include \
- external/stlport/stlport \
- external/gtest/include \
system/extras/tests/include \
frameworks/base/include
LOCAL_MODULE := binderAddInts
LOCAL_SRC_FILES := binderAddInts.cpp
+
+include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
index 8e2d3f0..94476ce 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 @@
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