commit b3733086ab415088b97fac20b3eea24433a7d2c5
author Hiroshi Yamauchi <yamauchi@google.com> Mon Aug 12 17:28:49 2013 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Tue Aug 13 13:53:12 2013 -0700
tree ad853d385e5c113e5d6248d0f7d198d7d9136865
parent 4baa8083ae0820f71cf0f03b94fd7f8d3b9bfa46

Add a systrace support for lock contention logging.

- Now several ART executables like oatdump need to link with libcutils
  as the mutex code is shared among them.
- The blocking thread ID and lock owner thread ID are passed to
  ScopedContentionRecorder in the correct order.

Bug: 9986464
Change-Id: Id766de23fbc4af1d8ba2de051595e365b04f5ae7

dex2oat/Android.mk

diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk
index 5cfab51..05dcd7b 100644
--- a/dex2oat/Android.mk
+++ b/dex2oat/Android.mk
@@ -22,10 +22,10 @@
 	dex2oat.cc
 
 ifeq ($(ART_BUILD_TARGET_NDEBUG),true)
-  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler,art/compiler,target,ndebug))
+  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler,art/compiler,target,ndebug))
 endif
 ifeq ($(ART_BUILD_TARGET_DEBUG),true)
-  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,target,debug))
+  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler,art/compiler,target,debug))
 endif
 
 ifeq ($(WITH_HOST_DALVIK),true)