am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system."
* commit '14af5526b5001431af49e40be049b5475de64f15':
Remove aprof support from the build system.
diff --git a/core/binary.mk b/core/binary.mk
index c677dea..55b529c 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -132,15 +132,6 @@
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 0648b35..7b3ab31 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -83,8 +83,6 @@
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 d6b342e..f35ebcc 100644
--- a/core/executable.mk
+++ b/core/executable.mk
@@ -23,17 +23,6 @@
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 5619274..bf83c0c 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -31,17 +31,6 @@
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 @@
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 976963e..525806b 100644
--- a/core/static_library.mk
+++ b/core/static_library.mk
@@ -18,13 +18,6 @@
$(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)