From d8b5f50d0c6c9a0ce157e89df4ee1e8eb8b334c3 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Thu, 30 Sep 2010 14:02:54 -0700 Subject: Correct dexopt for uniprocessors. The SMP flag was defaulting to "true" for dexopt, even on uniprocessors. With this change the VM now has three choices: dexopt for SMP, dexopt for uniprocessor, or dexopt for current system. The last is used for just-in-time dexopt (used by -eng and -userdebug builds on bootstrap DEX files) and installd dexopt (used for apps on all builds). The dexopt used by the build system during -user builds will either be explicitly SMP or explicitly uniprocessor, since "current system" has no meaning when you're cross-dexopting. Also, unified the dexopt control flags into a single enum. (cherry-pick from dalvik-dev) Change-Id: Id1d9c548ca8567585a28ef9ee911cc2ac6b116dd --- libdex/OptInvocation.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'libdex/OptInvocation.h') diff --git a/libdex/OptInvocation.h b/libdex/OptInvocation.h index d9708caed..0352eb423 100644 --- a/libdex/OptInvocation.h +++ b/libdex/OptInvocation.h @@ -13,20 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /* * Utility functions related to "dexopt". */ #ifndef _LIBDEX_OPTINVOCATION #define _LIBDEX_OPTINVOCATION -#include -#include - #ifdef __cplusplus extern "C" { #endif - /* * Utility routines, used by the VM. */ @@ -34,15 +31,6 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName); int dexOptCreateEmptyHeader(int fd); -/* some flags that get passed through to "dexopt" command */ -#define DEXOPT_OPT_ENABLED (1) -#define DEXOPT_OPT_ALL (1 << 1) -#define DEXOPT_VERIFY_ENABLED (1 << 2) -#define DEXOPT_VERIFY_ALL (1 << 3) -#define DEXOPT_IS_BOOTSTRAP (1 << 4) -#define DEXOPT_GEN_REGISTER_MAP (1 << 5) - - #ifdef __cplusplus }; #endif -- cgit v1.2.3