StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove emulator-based dexpreopt logic from the build system.

Browse Source 
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
This commit is contained in:
Ying Wang
2010-09-27 10:37:25 -07:00
parent 97984c41fe
commit 0235237805
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/Makefile
View File

@@ -694,14 +694,11 @@ endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# system yaffs image # system image
# #
# First, the "unoptimized" image, which contains .apk/.jar files systemimage_intermediates := \
# that contain regular, unoptimized/unverified .dex entries. $(call intermediates-dir-for,PACKAGING,systemimage)
# BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
systemimage_unopt_intermediates := \
$(call intermediates-dir-for,PACKAGING,systemimage_unopt)
BUILT_SYSTEMIMAGE_UNOPT := $(systemimage_unopt_intermediates)/system.img
INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \ INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
$(ALL_PREBUILT) \ $(ALL_PREBUILT) \
@@ -728,26 +725,11 @@ define build-systemimage-target
endef endef
endif # INTERNAL_USERIMAGES_USE_EXT 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,$@) $(call build-systemimage-target,$@)
# The installed image, which may be optimized or unoptimized.
#
INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img 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) SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)
endif
# The system partition needs room for the recovery image as well. We # 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 # 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 # TODO: Remove this and the corresponding block in
# config/product_config.make once host-based Dalvik preoptimization is # config/product_config.make once host-based Dalvik preoptimization is
# working. # working.
ifneq (true,$(DISABLE_DEXPREOPT))
ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true) ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif endif
endif
# Disallow mock locations by default for user builds # Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0 ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0