tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 02352378: Remove emulator-based dexpreopt logic from the build system.

Browse source 
Merge commit '0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp

* commit '0235237805991b48831dc8add072a50c478b2fcb':
  Remove emulator-based dexpreopt logic from the build system.
This commit is contained in:
Ying Wang 2010-09-27 11:52:45 -07:00 committed by Android Git Automerger
commit dc45f86af8
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/Makefile
View file

@ -694,14 +694,11 @@ endif
# -----------------------------------------------------------------
# system yaffs image
# system image
#
# First, the "unoptimized" image, which contains .apk/.jar files
# that contain regular, unoptimized/unverified .dex entries.
#
systemimage_unopt_intermediates := \
$(call intermediates-dir-for,PACKAGING,systemimage_unopt)
BUILT_SYSTEMIMAGE_UNOPT := $(systemimage_unopt_intermediates)/system.img
systemimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,systemimage)
BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
$(ALL_PREBUILT) \
@ -728,26 +725,11 @@ define build-systemimage-target
endef
endif # INTERNAL_USERIMAGES_USE_EXT
$(BUILT_SYSTEMIMAGE_UNOPT): $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
$(BUILT_SYSTEMIMAGE): $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
$(call build-systemimage-target,$@)
# The installed image, which may be optimized or unoptimized.
#
INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img
ifdef WITH_DEXPREOPT
ifndef DISABLE_DEXPREOPT
# TODO: remove the unnecessary code.
# with_dexpreopt := true
endif
endif
ifdef with_dexpreopt
# This file will set BUILT_SYSTEMIMAGE and SYSTEMIMAGE_SOURCE_DIR
include build/tools/dexpreopt/Config.mk
else
BUILT_SYSTEMIMAGE := $(BUILT_SYSTEMIMAGE_UNOPT)
SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)
endif
SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)
# The system partition needs room for the recovery image as well. We
# now store the recovery image as a binary patch using the boot image

2
core/main.mk
View file

@ -224,9 +224,11 @@ ifneq (,$(user_variant))
# TODO: Remove this and the corresponding block in
# config/product_config.make once host-based Dalvik preoptimization is
# working.
ifneq (true,$(DISABLE_DEXPREOPT))
ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true)
WITH_DEXPREOPT := true
endif
endif
# Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0