make/CompileJavaModules.gmk

*** 459,468 ****
--- 459,475 ----
  # Exclude BreakIterator classes that are just used in compile process to generate
  # data files and shouldn't go in the product
  jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
  
  ################################################################################
+ # If this is an imported module that has prebuilt classes, only compile
+ # module-info.java.
+ ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
+   $(MODULE)_INCLUDE_FILES := module-info.java
+ endif
+ 
+ ################################################################################
  # Setup the compilation for the module
  #
  MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE))
  
  # The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying