summaryrefslogtreecommitdiffstats
path: root/core/shared_library.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-22 14:31:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-22 14:31:05 -0700
commit4a65f812373e1ecfa6e7058d635e998429a4cf17 (patch)
tree23eec6f45a1db6fd684f7d9a43a8bf2580c6d5cf /core/shared_library.mk
parentec0f69a81a4a8ce1c424ec5f4768e86548300891 (diff)
parent6e587f53152127370c6b45204f6529dd7b0ce32a (diff)
downloadbuild-4a65f812373e1ecfa6e7058d635e998429a4cf17.zip
build-4a65f812373e1ecfa6e7058d635e998429a4cf17.tar.gz
build-4a65f812373e1ecfa6e7058d635e998429a4cf17.tar.bz2
am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
* commit '6e587f53152127370c6b45204f6529dd7b0ce32a': Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
Diffstat (limited to 'core/shared_library.mk')
-rw-r--r--core/shared_library.mk13
1 files changed, 13 insertions, 0 deletions
diff --git a/core/shared_library.mk b/core/shared_library.mk
index d715349..ab7480d 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -20,12 +20,25 @@ ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),)
$(error $(LOCAL_PATH): Can not set module stem for a library)
endif
+####################################################
+## 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.
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)
my_target_global_ldflags := $(TARGET_GLOBAL_LDFLAGS)