am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE...

* commit '6e587f53152127370c6b45204f6529dd7b0ce32a':
  Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI

diff --cc core/binary.mk
Simple merge

diff --cc core/clear_vars.mk
Simple merge

diff --cc core/shared_library.mk
index d715349,1c51346..ab7480d
--- 1/core/shared_library.mk
--- 2/core/shared_library.mk
+++ b/core/shared_library.mk
@@@ -16,10 -16,19 +16,22 @@@ endi
  ifneq ($(strip $(OVERRIDE_BUILT_MODULE_PATH)),)
  $(error $(LOCAL_PATH): Illegal use of OVERRIDE_BUILT_MODULE_PATH)
  endif
 +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)

diff --cc core/static_library.mk
index 66e091b,315c497..2a8edfd
--- 1/core/static_library.mk
--- 2/core/static_library.mk
+++ b/core/static_library.mk
@@@ -14,10 -14,14 +14,17 @@@ ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),
  LOCAL_MODULE_SUFFIX := .a
  endif
  LOCAL_UNINSTALLABLE_MODULE := true
 +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)),true)
+   LOCAL_WHOLE_STATIC_LIBRARIES += libaprof
+ endif
+ 
  include $(BUILD_SYSTEM)/binary.mk
  
  ifeq ($(LOCAL_RAW_STATIC_LIBRARY),true)