commit 46fc2341c535ba624fd2dceec9399ce681a80866
author Brian Carlstrom <bdc@google.com> Thu Sep 30 15:00:31 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 30 15:00:31 2010 -0700
tree c74b39c3725ca3ca073ecdfd95a1fdf58dbfbc6b
parent f51f24a6ea5d972dcaf60f882c26a0a08c9014fc
parent e947865041c3e8b32ea43e74d95c33e2153152ee

Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 1aabf94..51f98ad 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1279,7 +1279,8 @@
 sdk_atree_files := \
 	$(atree_dir)/sdk.exclude.atree \
 	$(atree_dir)/sdk.atree \
-	$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree
+	$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
+	sdk/build/tools.atree
 
 deps := \
 	$(target_notice_file_txt) \
@@ -1293,6 +1294,7 @@
 	$(INSTALLED_BUILD_PROP_TARGET) \
 	$(ATREE_FILES) \
 	$(atree_dir)/sdk.atree \
+	sdk/build/tools.atree \
 	$(HOST_OUT_EXECUTABLES)/atree \
     $(HOST_OUT_EXECUTABLES)/line_endings