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

* commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0':
  Add atrace to core.mk
This commit is contained in:
Jamie Gennis
2012-06-12 12:41:26 -07:00
committed by Android Git Automerger

View File

@@ -43,6 +43,7 @@ PRODUCT_PACKAGES := \
UserDictionaryProvider \
VpnDialogs \
apache-xml \
atrace \
bouncycastle \
bu \
cacerts \
@@ -121,6 +122,7 @@ PRODUCT_PACKAGES := \
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)