8074091: Remove dead code from merge mistake in JavaCompilation.gmk
authorerikj
Wed, 04 Mar 2015 11:00:04 +0100
changeset 29174 fe55607529c3
parent 29173 ad065cf432e9
child 29175 2f9d8f167bd7
8074091: Remove dead code from merge mistake in JavaCompilation.gmk Reviewed-by: ihse
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.