# HG changeset patch # User erikj # Date 1425463204 -3600 # Node ID fe55607529c38a4cbd60e25d12126eb296d752cb # Parent ad065cf432e9cba8aa9e4b57772e2a6fad6dff75 8074091: Remove dead code from merge mistake in JavaCompilation.gmk Reviewed-by: ihse diff -r ad065cf432e9 -r fe55607529c3 make/common/JavaCompilation.gmk --- a/make/common/JavaCompilation.gmk Wed Mar 04 10:47:36 2015 +0100 +++ b/make/common/JavaCompilation.gmk Wed Mar 04 11:00:04 2015 +0100 @@ -330,13 +330,7 @@ $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.