diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 10:46:30 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-12 10:46:30 -0700 |
| commit | caacf4e89793e6a929b1165f9616c5f6d1a03f25 (patch) | |
| tree | 187f327f1ae183178ad1320e9f2e8c7100f98cd9 /memtrack | |
| parent | a64e3c55546f4d94c55f35e341a886c1dfab9e47 (diff) | |
| download | extras-caacf4e89793e6a929b1165f9616c5f6d1a03f25.tar.gz | |
Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers.
Change-Id: I0762ada6a759bcbb9b1d40f8bfd2255949da860d
Diffstat (limited to 'memtrack')
| -rw-r--r-- | memtrack/Android.mk | 11 |
1 files changed, 4 insertions, 7 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) |