From 64ee717be7cf4aad64371e73cfd180aa4d85dd07 Mon Sep 17 00:00:00 2001
From: Bill Buzbee <buzbee@google.com>
Date: Mon, 22 Mar 2010 13:59:45 -0700
Subject: [PATCH] Jit: Re-enable for Sapphire

Change-Id: Icbfd8781756c2c7cde88140ed40766e29448b1ff
---
 CleanSpec.mk  | 13 +++++++------
 vm/Android.mk |  5 -----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b65e..13c482b00 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -20,13 +20,13 @@
 #
 # E.g.:
 #     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#     $(call add-clean-step, rm -rf $(OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
 #
 # Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
 # files that are missing or have been moved.
 #
 # Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
+# Use $(OUT) to refer to the "out" directory.
 #
 # If you need to re-do something that's already mentioned, just copy
 # the command and add it to the bottom of the list.  E.g., if a change
@@ -39,11 +39,12 @@
 # ************************************************
 
 # For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(OUT)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
+#$(call add-clean-step, rm -rf $(OUT)/obj/SHARED_LIBRARIES/libdvm*)
+$(call add-clean-step, rm -rf $(OUT)/obj/SHARED_LIBRARIES/libdvm*)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/vm/Android.mk b/vm/Android.mk
index 0138b1737..a301f55f1 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -32,11 +32,6 @@ LOCAL_PATH:= $(call my-dir)
 # Build for the target (device).
 #
 
-
-ifeq ($(TARGET_ARCH_VARIANT),armv5te)
-    WITH_JIT := false
-endif
-
 # Build the installed version (libdvm.so) first
 include $(LOCAL_PATH)/ReconfigureDvm.mk
 
-- 
2.11.0