From eb8ced8051165adaa4387fb75f52c0034aafc9cf Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Wed, 4 Mar 2015 11:00:04 +0100 Subject: [PATCH] 8074091: Remove dead code from merge mistake in JavaCompilation.gmk Reviewed-by: ihse --- make/common/JavaCompilation.gmk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk index 41f1f0745da..4104f0b51ed 100644 --- a/make/common/JavaCompilation.gmk +++ b/make/common/JavaCompilation.gmk @@ -330,13 +330,7 @@ define SetupArchiveInner $1 += $$($1_JAR) endef - $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) - ifneq ($$($1_EXCLUDE_FILES),) - # Cannot precompute ZIP_EXCLUDE_FILES as it is dependent on which src root is being - # zipped at the moment. - $1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES) - $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS)) - endif + define add_file_to_copy # param 1 = BUILD_MYPACKAGE # parma 2 = The source file to copy.