commit c816e061270327d3e2b73ae3c848e1fefc6ec6ef
author Noreen Tolland <noreent@google.com> Fri Jan 31 23:13:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 31 23:13:24 2014 +0000
tree ba2acb5a31def3000cea675a776df929ab1078bc
parent ec0c99a6c574954fb37bd94ba18b02a20edbe122
parent b60a3f97d111d0a7881619873da40468eb06433b

Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index a7e21e0..b0cccc9 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -57,7 +57,9 @@
 	target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \
 	target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \
 	target/common/obj/JAVA_LIBRARIES/mms-common_intermediates \
-	target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates
+	target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates \
+	target/common/obj/JAVA_LIBRARIES/android-common_intermediates \
+
 # not java libraries
 PDK_PLATFORM_JAVA_ZIP_CONTENTS += \
 	target/common/obj/APPS/framework-res_intermediates/package-export.apk \

target/product/embedded.mk

diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 97a50a1..b0a5396 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -20,6 +20,7 @@
 PRODUCT_PACKAGES += \
     adb \
     adbd \
+    atrace \
     bootanimation \
     debuggerd \
     dumpstate \