aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatish Patel <satish.patel@linaro.org>2016-06-26 15:30:13 +0530
committerSatish Patel <satish.patel@linaro.org>2016-06-26 15:30:13 +0530
commitec17c347d05594ed047e028f49d55b728a2a9e43 (patch)
tree0422edc4278197045f1eeb80ffa521fb53e3d1fb
parent7dfe37d71d1f0a8494f19725d739f02ac0f42897 (diff)
downloadgperftools-master.tar.gz
cleanup Android.mkHEADmaster
- added -lm to LDLIBS - removed unwanted lines, which are commented - removed -lm and -llog for WHOLE_STATIC_LIST: This is to remove cross dependency while used a default malloc with libc Signed-off-by: Satish Patel <satish.patel@linaro.org>
-rw-r--r--Android.mk18
1 files changed, 1 insertions, 17 deletions
diff --git a/Android.mk b/Android.mk
index 26955d0..9782e6f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,10 +88,6 @@ libtcmalloc_minimal_src := \
src/base/spinlock_internal.cc \
src/memfs_malloc.cc \
-
-
-
-
#-----------------------------------------------------------------------
# tcmalloc static library
#-----------------------------------------------------------------------
@@ -111,23 +107,11 @@ LOCAL_SRC_FILES := \
$(libtcmalloc_minimal_src) \
# This is linked into libc, which asan runtime library depends on.
-#LOCAL_SANITIZE := never
-#LOCAL_STRIP_MODULE := false
-
-
-#LOCAL_SHARED_LIBRARIES += \
-# liblog \
-# libm
-LOCAL_LDLIBS := -llog
-
-#LOCAL_CXX_STL := libc++_static
-#LOCAL_CXX_STL := libc++
+LOCAL_LDLIBS := -llog -lm
-#LOCAL_CPP_FEATURES := rtti exceptions
LOCAL_EXPORT_CFLAGS := $(tcmalloc_common_cflags)
LOCAL_EXPORT_CPPFLAGS := $(tcmalloc_cppflags)
LOCAL_EXPORT_C_INCLUDES := $(tcmalloc_common_c_includes)
LOCAL_EXPORT_LDLIBS := -llog -lm
LOCAL_MODULE := libtcmalloc
-LOCAL_WHOLE_STATIC_LIBRARIES := liblog libm
include $(BUILD_STATIC_LIBRARY)