commit f3b1395a41a1f882fac74b8a55723af8f77535d0
author Jamie Gennis <jgennis@google.com> Mon Jun 11 12:04:24 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 11 12:04:24 2012 -0700
tree 63e7ccecce26cda23415a26dd615d9ccfda1300a
parent e245ecdc0a87fb198894995ffbc4e6fec8d812f8
parent a9efae347f3b3eb41ec1c4f96993e3c7ce48eec1

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

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)