ANRdaemon: add a few new trace options and poke all userland services am: 5b42895d33...

am: 90ce7ac45f

* commit '90ce7ac45f183aad12151d691f82a4a9c9a78f2f':
  ANRdaemon: add a few new trace options and poke all userland services

Change-Id: Id46f7b9f0b0390e529fe72eabf238a3c9dad9615

diff --cc ANRdaemon/Android.mk
index 535eb8c,449df1e..24072e2
--- 1/ANRdaemon/Android.mk
--- 2/ANRdaemon/Android.mk
+++ b/ANRdaemon/Android.mk
@@@ -1,16 -1,14 +1,15 @@@
- LOCAL_PATH:= $(call my-dir)
- include $(CLEAR_VARS)
+ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
  
- LOCAL_SRC_FILES:= ANRdaemon.cpp
+ LOCAL_PATH:= $(call my-dir)
  
+ include $(CLEAR_VARS)
+ LOCAL_SRC_FILES := ANRdaemon.cpp
  LOCAL_C_INCLUDES += external/zlib
- 
- LOCAL_MODULE:= anrdaemon
- 
- LOCAL_MODULE_TAGS:= optional
- 
+ LOCAL_MODULE := anrd
+ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+ LOCAL_MODULE_TAGS := debug
  LOCAL_SHARED_LIBRARIES := \
 +    liblog \
      libbinder \
      libcutils \
      libutils \