commit 82c11caca04bc4e14e0a33057f484635dc1ae8dc
author Jamie Gennis <jgennis@google.com> Tue Jun 12 12:41:26 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 12:41:26 2012 -0700
tree 6cd84f33641fd3e71e51ff8c164f2be3d718927b
parent ddb706785bd96fe7b450779ab41d1276939ee9fa
parent f3b1395a41a1f882fac74b8a55723af8f77535d0

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

* commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0':
  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)