From 40a4a83c90847f2c148766a0b50e00b8c7e8bc74 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 25 Mar 2016 18:14:49 -0700 Subject: [PATCH] [DO NOT MERGE] Remove code pulled in by accident. Remove code pulled in by accident in cherry-pick commit fbc5b9f56. Change-Id: I4e4a336faf71782c208631c581b2587a5364212f --- core/dex_preopt.mk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 457f1d4de..3a43336ba 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -19,18 +19,6 @@ DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREO # The default value for LOCAL_DEX_PREOPT DEX_PREOPT_DEFAULT ?= true -# The default values for pre-opting: always preopt PIC. -# Conditional to building on linux, as dex2oat currently does not work on darwin. -ifeq ($(HOST_OS),linux) - WITH_DEXPREOPT_PIC ?= true - WITH_DEXPREOPT ?= true -# For an eng build only pre-opt the boot image. This gives reasonable performance and still -# allows a simple workflow: building in frameworks/base and syncing. - ifeq (eng,$(TARGET_BUILD_VARIANT)) - WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true - endif -endif - GLOBAL_DEXPREOPT_FLAGS := ifeq ($(WITH_DEXPREOPT_PIC),true) # Compile boot.oat as position-independent code if WITH_DEXPREOPT_PIC=true