commit d676f3e69fce7bd67b672b270ab0240bfa69ce23
author Jamie Gennis <jgennis@google.com> Tue Jun 12 13:14:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 13:14:45 2012 -0700
tree 0ef0daf6d417d2c3aa4b9dfc281e198f2b9775d0
parent d4e82e01ee14a8c586e50348bcfa3cdf5aecffd1
parent 82c11caca04bc4e14e0a33057f484635dc1ae8dc

am 82c11cac: am f3b1395a: Merge "Add atrace to core.mk" into jb-dev

* commit '82c11caca04bc4e14e0a33057f484635dc1ae8dc':
  Add atrace to core.mk

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index 58002a7..57c0f44 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -43,6 +43,7 @@
     UserDictionaryProvider \
     VpnDialogs \
     apache-xml \
+    atrace \
     bouncycastle \
     bu \
     cacerts \
@@ -121,6 +122,7 @@
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:root/init.usb.rc \
+    system/core/rootdir/init.trace.rc:root/init.trace.rc \
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)