Looks good to me.
-- Jon
On 05/10/2013 02:06 PM, Joe Darcy wrote:
Hello,
Please review the patch below for JDK-8014365 "Restore
Objects.requireNonNull(T, Supplier<String>)" which addresses the issue
tripped over during JDK-8012344 "Backout 8011800 until langtools
genstubs updated."
A full build with the below patch to langtools and the update JDK
library succeeds.
Thanks,
-Joe
diff -r ce7e1674eb73 makefiles/BuildLangtools.gmk
--- a/makefiles/BuildLangtools.gmk Fri May 10 16:10:20 2013 +0100
+++ b/makefiles/BuildLangtools.gmk Fri May 10 14:04:29 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights
reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights
reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -123,10 +123,10 @@
genstubs.GenStubs
# We fetch source from the JDK...
JDKS=$(JDK_TOPDIR)/src/share/classes
- # Build the list of classes to generate stubs from.
java/util/Objects.java isn't
+ # Build the list of classes to generate stubs from.
java/util/function/Predicate.java isn't
# currently needed, but is used as a demo for now.
STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
- -e "$(JDKS)/java/util/Objects.java")
+ -e "$(JDKS)/java/util/function/Predicate.java")
# Rewrite the file names into class names because the
GenStubs tool require this.
STUBCLASSES:=$(subst /,.,$(patsubst
$(JDKS)/%.java,%,$(STUBSOURCES)))
