commit eb06c77b804b364f1ab5220cf008f79c2014aead
author Andreas Gampe <agampe@google.com> Fri Nov 18 02:53:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 18 02:53:29 2016 +0000
tree f4dda44a73e87fc93d918d08a1fff0931e401d26
parent 020f5275d567f0c2488ea443cde31c0aa32517d2
parent ff00c5d78faeacfaae1abc69d69d7cd8c0e9d3ff

Merge "Build: Bring back SDK dependencies"

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index fb75bff..0bbcdc6 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -64,13 +64,19 @@
     ahat \
     dexdump \
     dexlist \
-    hprof-conv \
     oatdump \
 
 # Certificates.
 PRODUCT_PACKAGES += \
     cacerts \
 
+# SDK dependencies. WHY ARE THEY HERE?!?!
+PRODUCT_PACKAGES += \
+    hprof-conv \
+    dexdeps \
+    dmtracedump \
+    dx \
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     dalvik.vm.image-dex2oat-Xms=64m \
     dalvik.vm.image-dex2oat-Xmx=64m \