commit 6bc232a11621740d14f517218d2599a714fb451f
author Jean-Baptiste Queru <jbq@google.com> Mon Sep 27 17:24:02 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 27 17:24:02 2010 -0700
tree 2539c8bf270c053dd6331508dc66e2c1c386a090
parent 1fdbf261a0d550baaed96f5461bb014754364c16
parent 102b8f46a53c955a71c9cebccf3c2e14f0d300d7

Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread

core/java_library.mk

diff --git a/core/java_library.mk b/core/java_library.mk
index 8dd6d41..794b5d6 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -23,6 +23,9 @@
 
 LOCAL_BUILT_MODULE_STEM := javalib.jar
 
+intermediates := $(call local-intermediates-dir)
+intermediates.COMMON := $(call local-intermediates-dir,COMMON)
+
 ifndef LOCAL_IS_HOST_MODULE
 ifeq (true,$(WITH_DEXPREOPT))
 ifndef LOCAL_DEX_PREOPT

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index e85aab6..a8f2d4d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -150,9 +150,6 @@
     setpaths
     set_sequence_number
 
-    # Don't try to do preoptimization until it works better on OSX.
-    export DISABLE_DEXPREOPT=true
-
     export ANDROID_BUILD_TOP=$(gettop)
 }