changeset 10222:313dd4059170

8062635: Enable custom CompileJavaClasses.gmk Reviewed-by: erikj
author rriggs
date Fri, 31 Oct 2014 14:28:38 -0400
parents 8a59218a1ec2
children 20688e65812b
files make/CompileJavaClasses.gmk
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaClasses.gmk	Tue Oct 14 19:35:03 2014 +0200
+++ b/make/CompileJavaClasses.gmk	Fri Oct 31 14:28:38 2014 -0400
@@ -37,6 +37,11 @@
 EXCLUDES :=
 
 ##########################################################################################
+# Include the corresponding custom file, if present.
+
+-include $(CUSTOM_MAKE_DIR)/CompileJavaClasses.gmk
+
+##########################################################################################
 
 EXCLUDES += com/sun/pept \
     com/sun/tools/example/trace \
@@ -53,7 +58,7 @@
 
 ifndef OPENJDK
   # There exists two versions of these files...
-  EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
+  EXFILES += $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
   EXFILES += $(JDK_TOPDIR)/src/share/classes/sun/management/ExtendedPlatformComponent.java
 
   ifeq ($(OPENJDK_TARGET_OS), windows)