Code drop from //branches/cupcake/...@124589
diff --git a/tools/dexpreopt/Android.mk b/tools/dexpreopt/Android.mk
index 3988387..40aeee2 100644
--- a/tools/dexpreopt/Android.mk
+++ b/tools/dexpreopt/Android.mk
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 ifneq ($(TARGET_SIMULATOR),true)
+ifneq ($(DISABLE_DEXPREOPT),true)
 
 LOCAL_PATH := $(my-dir)
 include $(CLEAR_VARS)
@@ -33,4 +34,5 @@
 		$(LOCAL_PATH)/afar/Android.mk
 include $(subdir_makefiles)
 
+endif # !disable_dexpreopt
 endif # !sim