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

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

Move odex related files to product-specific dir. 

For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.

Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
parent 46fc2341

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ ifneq ($(strip $(all_java_sources)$(all_res_assets)),) 
full_static_java_libs := \

    $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \

      $(call intermediates-dir-for, \

        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE))/javalib.jar)

        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),COMMON)/javalib.jar)



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_INSTALL_DIR := $(dir $(LOCAL_INSTALLED_MODULE))

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates)/classes

core/cleanbuild.mk

+2 −4
Original line number Diff line number Diff line
@@ -187,10 +187,8 @@ installclean_files := \ 
	./$(PRODUCT_OUT)/recovery \

	./$(PRODUCT_OUT)/root \

	./$(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

	./$(PRODUCT_OUT)/dex_bootjars \

	./$(PRODUCT_OUT)/obj/JAVA_LIBRARIES



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

# in the staging and emulator data partitions.

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ $(strip \ 
    $(if $(_idfName),, \

        $(error $(LOCAL_PATH): Name not defined in call to intermediates-dir-for)) \

    $(eval _idfPrefix := $(if $(strip $(3)),HOST,TARGET)) \

    $(if $(filter $(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

    $(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \

        $(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \

      , \

        $(eval _idfIntBase := $($(_idfPrefix)_OUT_INTERMEDIATES)) \

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ define _dexpreopt-boot-jar 
$(eval _dbj_jar := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1).jar)

$(eval _dbj_odex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1).odex)

$(eval _dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar)

$(eval _dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.dex.jar)

$(eval _dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar)

$(eval $(_dbj_odex): PRIVATE_DBJ_JAR := $(_dbj_jar))

$(_dbj_odex) : $(_dbj_src_jar) | $(ACP) $(DEXPREOPT) $(DEXOPT)

	@echo "Dexpreopt Boot Jar: $$@"

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ TARGET_INSTALLER_DATA_OUT := $(TARGET_INSTALLER_OUT)/data 
TARGET_INSTALLER_ROOT_OUT := $(TARGET_INSTALLER_OUT)/root

TARGET_INSTALLER_SYSTEM_OUT := $(TARGET_INSTALLER_OUT)/root/system



COMMON_MODULE_CLASSES := JAVA_LIBRARIES NOTICE_FILES

COMMON_MODULE_CLASSES := TARGET-NOTICE_FILES HOST-NOTICE_FILES HOST-JAVA_LIBRARIES



ifeq (,$(strip $(DIST_DIR)))

  DIST_DIR := $(OUT_DIR)/dist