Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7874c43 authored by Ying Wang's avatar Ying Wang
Browse files

Integrate dexpreopt into the build system. 

Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
parent 38a3161d

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -737,7 +737,8 @@ INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img 


ifdef WITH_DEXPREOPT

  ifndef DISABLE_DEXPREOPT

    with_dexpreopt := true

# TODO: remove the unnecessary code.

#  with_dexpreopt := true

  endif

endif

ifdef with_dexpreopt

core/base_rules.mk

+10 −0
Original line number Diff line number Diff line
@@ -492,6 +492,16 @@ $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) 
	$(copy-file-to-target-with-cp)

endif



ifeq ($(LOCAL_DEX_PREOPT),true)

installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex

built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex

$(installed_odex) : $(built_odex) | $(ACP)

	@echo "Install: $@"

	$(copy-file-to-target)



$(LOCAL_INSTALLED_MODULE): $(installed_odex)

endif



endif # !LOCAL_UNINSTALLABLE_MODULE

core/cleanbuild.mk

+5 −1
Original line number Diff line number Diff line
@@ -186,7 +186,11 @@ installclean_files := \ 
	./$(PRODUCT_OUT)/obj/PACKAGING \

	./$(PRODUCT_OUT)/recovery \

	./$(PRODUCT_OUT)/root \

	./$(PRODUCT_OUT)/system

	./$(PRODUCT_OUT)/system \

	./$(PRODUCT_OUT)/dex_bootjars



# TODO: move the dex-preopt files to a product-specific directory

installclean_files += ./$(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/*/javalib.jar



# The files/dirs to delete during a dataclean, which removes any files

# in the staging and emulator data partitions.

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ LOCAL_PROGUARD_FLAGS:= 
LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_MANIFEST_FILE:=

LOCAL_BUILD_HOST_DEX:=

LOCAL_DEX_PREOPT:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ E2FSCK := e2fsck 
JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

DEXOPT := $(HOST_OUT_EXECUTABLES)/dexopt$(HOST_EXECUTABLE_SUFFIX)

DEXPREOPT := dalvik/tools/dex-preopt



# ACP is always for the build OS, not for the host OS

ACP := $(BUILD_OUT_EXECUTABLES)/acp$(BUILD_EXECUTABLE_SUFFIX)