am c4c71f06: Merge "Remove aprof support from the build system." (14af5526) · Commits · e / os / android_build

core/binary.mk

+0 −9

Original line number	Diff line number	Diff line
		@@ -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

+0 −2

Original line number	Diff line number	Diff line
		@@ -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:=

+0 −11

Original line number	Diff line number	Diff line
		@@ -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

+0 −12

Original line number	Diff line number	Diff line
		@@ -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)

+0 −7

Original line number	Diff line number	Diff line
		@@ -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)