RFR: JDK-8074091: Remove dead code from merge mistake in JavaCompilation.gmk

Erik Joelsson erik.joelsson at oracle.com
Mon Mar 2 11:03:03 UTC 2015


Hello,

In JavaCompilation.gmk, between the definitions of SetupArchive and 
add_file_to_copy, there is a partial block of code that looks like it 
shouldn't be there. It seems to be part of the moved SetupZipArchive and 
has most likely reappeared in JavaCompilation in a merge. The code 
snippet is definitely not used and should be removed.

Bug: https://bugs.openjdk.java.net/browse/JDK-8074091
Patch:
diff -r cc1ab909baf7 make/common/JavaCompilation.gmk
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -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.


/Erik



More information about the build-dev mailing list