From 639b39d35c10e615369e37bac3c2cbe92284e744 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chris.hegarty@oracle.com>
Date: Fri, 16 Dec 2016 05:46:45 +0000
Subject: [PATCH] 8170859: Run time and tool support for ModuleResolution

Reviewed-by: alanb, mchung
---
 make/CreateJmods.gmk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 8f3748b6908..564bb3af226 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -79,6 +79,11 @@ ifneq ($(MAN_DIR), )
   DEPS += $(call CacheFind, $(MAN_DIR))
 endif
 
+ifeq ($(filter-out jdk.incubator.%, $(MODULE)), )
+  JMOD_FLAGS += --do-not-resolve-by-default
+  JMOD_FLAGS += --warn-if-resolved=incubating
+endif
+
 # Add dependencies on other jmod files. Only java.base needs access to other
 # jmods.
 ifeq ($(MODULE), java.base)