diff --git a/core/binary.mk b/core/binary.mk index c677dea28..55b529cea 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -132,15 +132,6 @@ ifneq ($(strip $(LOCAL_FDO_SUPPORT)),) endif endif -#################################################### -## Add profiling flags if aprof is turned on -#################################################### -ifeq ($(strip $(LOCAL_ENABLE_APROF)),true) - # -ffunction-sections and -fomit-frame-pointer are conflict with -pg - LOCAL_CFLAGS += -fno-omit-frame-pointer -fno-function-sections -pg - LOCAL_CPPFLAGS += -fno-omit-frame-pointer -fno-function-sections -pg -endif - ########################################################### ## Explicitly declare assembly-only __ASSEMBLY__ macro for ## assembly source diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 0648b3517..7b3ab31f6 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -83,8 +83,6 @@ LOCAL_COPY_HEADERS_TO:= LOCAL_COPY_HEADERS:= LOCAL_FORCE_STATIC_EXECUTABLE:= LOCAL_ADDITIONAL_DEPENDENCIES:= -LOCAL_ENABLE_APROF:= -LOCAL_ENABLE_APROF_JNI:= LOCAL_COMPRESS_MODULE_SYMBOLS:= LOCAL_STRIP_MODULE:= LOCAL_JNI_SHARED_LIBRARIES:= diff --git a/core/executable.mk b/core/executable.mk index d6b342ef3..f35ebcc16 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -23,17 +23,6 @@ endif endif ifndef skip_build_from_source -#################################################### -## Add profiling libraries if aprof is turned -#################################################### -ifeq ($(strip $(LOCAL_ENABLE_APROF)),true) - ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE), true) - LOCAL_STATIC_LIBRARIES += libaprof libaprof_static libc libcutils - else - LOCAL_SHARED_LIBRARIES += libaprof libaprof_runtime libc - endif - LOCAL_WHOLE_STATIC_LIBRARIES += libaprof_aux -endif include $(BUILD_SYSTEM)/dynamic_binary.mk diff --git a/core/shared_library.mk b/core/shared_library.mk index 561927402..bf83c0cbe 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -31,17 +31,6 @@ endif endif ifndef skip_build_from_source -#################################################### -## Add profiling libraries if aprof is turned -#################################################### -ifeq ($(strip $(LOCAL_ENABLE_APROF_JNI)),true) - LOCAL_ENABLE_APROF := true - LOCAL_WHOLE_STATIC_LIBRARIES += libaprof_jni -endif - -ifeq ($(strip $(LOCAL_ENABLE_APROF)),true) - LOCAL_SHARED_LIBRARIES += libaprof libaprof_runtime -endif # Put the built targets of all shared libraries in a common directory # to simplify the link line. @@ -49,7 +38,6 @@ OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) include $(BUILD_SYSTEM)/dynamic_binary.mk - # Define PRIVATE_ variables from global vars my_target_global_ld_dirs := $(TARGET_GLOBAL_LD_DIRS) ifeq ($(LOCAL_CLANG),true) diff --git a/core/static_library.mk b/core/static_library.mk index 976963e4f..525806b71 100644 --- a/core/static_library.mk +++ b/core/static_library.mk @@ -18,13 +18,6 @@ ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),) $(error $(LOCAL_PATH): Cannot set module stem for a library) endif -#################################################### -## Add profiling libraries if aprof is turned -#################################################### -ifeq ($(strip $(LOCAL_ENABLE_APROF)),true) - LOCAL_WHOLE_STATIC_LIBRARIES += libaprof -endif - include $(BUILD_SYSTEM)/binary.mk ifeq ($(LOCAL_RAW_STATIC_LIBRARY),true)