Merge "Do not rerun dex2oat just because dex2oat changed" into ics-mr1-plus-art
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index dd33d1b..a6c52c3 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -19,9 +19,8 @@
# TODO: for now, override with debug version for better error reporting
DEX2OAT := $(DEX2OATD)
-# TODO: change DEX2OAT_DEPENDENCY to order-only prerequisite when output is stable
-# DEX2OAT_DEPENDENCY := | $(DEX2OAT) # only build dex2oat if needed to build oat files
-DEX2OAT_DEPENDENCY := $(DEX2OAT) # when dex2oat changes, rebuild all oat files
+DEX2OAT_DEPENDENCY := | $(DEX2OAT) # by default, do not run rerun dex2oat if the tool changes
+# DEX2OAT_DEPENDENCY := $(DEX2OAT) # uncomment to force dex2oat to rerun on after all changes
OATDUMP := $(HOST_OUT_EXECUTABLES)/oatdump$(HOST_EXECUTABLE_SUFFIX)
OATDUMPD := $(HOST_OUT_EXECUTABLES)/oatdumpd$(HOST_EXECUTABLE_SUFFIX)