From 00221d45e791892f8e34d069f20d8a67067a8dda Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Fri, 29 Jan 2016 13:06:11 +0100 Subject: [PATCH] Fix classes.jack extraction from platform.zip The copy is handled by the common rule, so JAVA_dependency_template really only needs to add the extra dependencies. Otherwise we were getting duplicate rule warnings. This may extract more files than necessary, but that's better than not enough. Bug: 26510884 Change-Id: I022f3cc6ddd1982af3f948740917ac03e795f4c5 --- core/pdk_config.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index b63031ff2f..41c3590aca 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -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)