commit b7bbba49d88eae58223d9878da4069bf6d7140bf
author Brian Carlstrom <bdc@google.com> Thu Oct 13 14:58:47 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Oct 14 00:24:28 2011 -0700
tree 00d1a0758d762903e648bb550434320822228c46
parent 30646836b4a1c6e5e80ddaea246cf9669eaa0628

Add oatopt drop in replacement for dexopt

Change-Id: I094375230af2d9a88e30245b390cac71be7b50f4

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 7875ee9..319d673 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -67,6 +67,9 @@
 OATEXEC_SRC_FILES := \
 	src/oatexec.cc
 
+OATOPT_SRC_FILES := \
+	src/oatopt.cc
+
 LIBART_COMMON_SRC_FILES := \
 	src/assembler.cc \
 	src/assembler_arm.cc \

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index 7619f74..d00002a 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -91,20 +91,24 @@
   $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),target,ndebug))
   $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),target,ndebug))
   $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,ndebug))
+  $(eval $(call build-art-executable,oatopt,$(OATOPT_SRC_FILES),target,ndebug))
 endif
 ifeq ($(ART_BUILD_TARGET_DEBUG),true)
   $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),target,debug))
   $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),target,debug))
   $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,debug))
+  $(eval $(call build-art-executable,oatopt,$(OATOPT_SRC_FILES),target,debug))
 endif
 ifeq ($(ART_BUILD_HOST_NDEBUG),true)
   $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,ndebug))
   $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),host,ndebug))
   $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,ndebug))
+  $(eval $(call build-art-executable,oatopt,$(OATOPT_SRC_FILES),host,ndebug))
 endif
 ifeq ($(ART_BUILD_HOST_DEBUG),true)
   $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),host,debug))
   $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),host,debug))
   $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,debug))
+  $(eval $(call build-art-executable,oatopt,$(OATOPT_SRC_FILES),host,debug))
 endif
 

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 59bb771..846cda3 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -20,8 +20,8 @@
 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)  # only build dex2oat if needed to build oat files
 
 OATDUMP := $(HOST_OUT_EXECUTABLES)/oatdump$(HOST_EXECUTABLE_SUFFIX)
 OATDUMPD := $(HOST_OUT_EXECUTABLES)/oatdumpd$(HOST_EXECUTABLE_SUFFIX)