commit 1a861719fdadf1a27cf7df9955311cc7d4d4c217
author Colin Cross <ccross@android.com> Wed Sep 07 00:16:35 2016 -0700
committer Colin Cross <ccross@android.com> Wed Sep 07 00:17:20 2016 -0700
tree c15c6f0b213845b20a0bae8b900940a4eecdd3f5
parent e251b1204f678919e37da32667fab2c5bbcbbb76

Revert "Convert more of art to Android.bp"

This reverts commits 4a456275e25c536f525b6c020ca38c8ada8a05de and
198a957915eb75c5f837ea57d385aa6cfa69f76e.

Change-Id: Ibe49f611ae3ed7748bcfc9ac07f8d1f52d6bea3a

Android.mk

diff --git a/Android.mk b/Android.mk
index 0ed5d87..4ea169a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -76,13 +76,20 @@
 ########################################################################
 # product rules
 
+include $(art_path)/dexdump/Android.mk
+include $(art_path)/dexlayout/Android.mk
+include $(art_path)/dexlist/Android.mk
 include $(art_path)/dex2oat/Android.mk
+include $(art_path)/disassembler/Android.mk
+include $(art_path)/oatdump/Android.mk
 include $(art_path)/imgdiag/Android.mk
 include $(art_path)/patchoat/Android.mk
 include $(art_path)/profman/Android.mk
+include $(art_path)/dalvikvm/Android.mk
 include $(art_path)/tools/Android.mk
 include $(art_path)/tools/ahat/Android.mk
 include $(art_path)/tools/dexfuzz/Android.mk
+include $(art_path)/tools/dmtracedump/Android.mk
 include $(art_path)/libart_fake/Android.mk
 
 
@@ -107,6 +114,7 @@
 include $(art_path)/build/Android.common_test.mk
 include $(art_path)/build/Android.gtest.mk
 include $(art_path)/test/Android.run-test.mk
+include $(art_path)/benchmark/Android.mk
 
 TEST_ART_ADB_ROOT_AND_REMOUNT := \
     (adb root && \