diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 18:07:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-12 18:07:32 +0000 |
| commit | c26f208487aa1d7cfb9baf2d0579a5696875c5d0 (patch) | |
| tree | 187f327f1ae183178ad1320e9f2e8c7100f98cd9 | |
| parent | a64e3c55546f4d94c55f35e341a886c1dfab9e47 (diff) | |
| parent | caacf4e89793e6a929b1165f9616c5f6d1a03f25 (diff) | |
| download | extras-c26f208487aa1d7cfb9baf2d0579a5696875c5d0.tar.gz | |
Merge "Remove makefile cruft."
| -rw-r--r-- | memtrack/Android.mk | 11 | ||||
| -rw-r--r-- | tests/binder/benchmarks/Android.mk | 11 | ||||
| -rw-r--r-- | tests/memtest/Android.mk | 9 |
3 files changed, 10 insertions, 21 deletions
diff --git a/memtrack/Android.mk b/memtrack/Android.mk index 66759bb5..22472ca3 100644 --- a/memtrack/Android.mk +++ b/memtrack/Android.mk @@ -17,11 +17,8 @@ LOCAL_PATH:= $(call my-dir) 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_MODULE := memtrack_share 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_TAGS := debug 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 8680f4da..c0ddb47b 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 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 |