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

Commit e2462f2d authored by Dan Willemsen's avatar Dan Willemsen Committed by Android (Google) Code Review
Browse files

Merge "Fix classes.jack extraction from platform.zip"

parents d0aefe79 00221d45

core/pdk_config.mk

+3 −5
Original line number Diff line number Diff line
@@ -152,10 +152,8 @@ PDK_FUSION_OUT_DIR := $(DEBUG_OUT_DIR) 
endif



define JAVA_dependency_template

$(PDK_FUSION_OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) \

  $(foreach d,$(2),$(PDK_FUSION_OUT_DIR)/$(d)) $(_pdk_fusion_stamp)

	@mkdir -p $$(dir $$@)

	$(hide) cp -fpPR $$< $$@

$(call add-dependency,$(PDK_FUSION_OUT_DIR)/$(strip $(1)),\

  $(foreach d,$(filter $(2),$(_pdk_fusion_java_file_list)),$(PDK_FUSION_OUT_DIR)/$(d)))

endef



# needs explicit dependency as package-export.apk is not explicitly pulled
@@ -174,7 +172,7 @@ $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\ 
    $(lib_dir)/classes.jar $(lib_dir)/classes.jack)))

$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\

  $(eval $(call JAVA_dependency_template,$(lib_dir)/classes.dex.toc,\

    $(filter $(lib_dir)/classes%.dex, $(_pdk_fusion_java_file_list)))))

    $(lib_dir)/classes.jar $(lib_dir)/classes.jack $(lib_dir)/classes%.dex)))



# implicit rules for all other target files

$(TARGET_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/target/common/% $(_pdk_fusion_stamp)