# HG changeset patch
# User erikj
# Date 1460992721 -7200
# Node ID 4fbd14764fa754c9b2fe90d374e8e4e94e42c961
# Parent  9ee61185a43ccf41044ae93e510364074a9e0c6d
8154430: Imported modules rebuilt on second run when nothing has changed
Reviewed-by: alanb, tbell

diff -r 9ee61185a43c -r 4fbd14764fa7 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Mon Apr 18 09:12:44 2016 +0200
+++ b/make/CompileJavaModules.gmk	Mon Apr 18 17:18:41 2016 +0200
@@ -542,8 +542,9 @@
 ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
   $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
       $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
-	$(RM) -r $(@D)
-	$(MKDIR) -p $(@D)
+	$(call MakeDir, $(@D))
+        # Do not delete marker and build meta data files
+	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
 	$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
 	$(TOUCH) $@