7143162: Allow disable building of jdk demos and samples

Reviewed-by: ohair

make/Makefile

@@ -234,7 +234,17 @@ all build:: sanity-all post-sanity-all
 
 SUBDIRS       = tools java javax sun com
 SUBDIRS_tools = launchers
-SUBDIRS_misc  = org sunw jpda mkdemo mksample
+SUBDIRS_misc  = org sunw jpda
+
+# demos
+ifndef NO_DEMOS
+  SUBDIRS_misc += mkdemo
+endif
+
+# samples
+ifndef NO_SAMPLES
+  SUBDIRS_misc += mksample
+endif
 
 # Alternate classes implementation
 ifndef OPENJDK
@@ -383,4 +393,3 @@ include jprt.gmk
 .PHONY: all build clean clobber optimized debug fastdebug create_links \
 	import import_product import_fastdebug import_debug \
 	test test_run test_start test_clean test_summary
-

make/common/Release.gmk

@@ -1095,8 +1095,12 @@ initial-image-jdk:: initial-image-jdk-setup \
 	@#
 	@# demo, include
 	@#
+ifndef NO_DEMOS
 	$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
+endif
+ifndef NO_SAMPLES
 	$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
+endif
 	$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
 	@#
 	@# Swing BeanInfo generation
@@ -1359,4 +1363,3 @@ images images-clobber::
 
 # Force rule
 FRC:
-

make/common/shared/Sanity-Settings.gmk

@@ -134,6 +134,8 @@ ALL_SETTINGS+=$(call addOptionalSetting,USE_HOTSPOT_INTERPRETER_MODE)
 ALL_SETTINGS+=$(call addOptionalSetting,PEDANTIC)
 ALL_SETTINGS+=$(call addOptionalSetting,DEV_ONLY)
 ALL_SETTINGS+=$(call addOptionalSetting,NO_DOCS)
+ALL_SETTINGS+=$(call addOptionalSetting,NO_DEMOS)
+ALL_SETTINGS+=$(call addOptionalSetting,NO_SAMPLES)
 ALL_SETTINGS+=$(call addOptionalSetting,NO_IMAGES)
 ALL_SETTINGS+=$(call addOptionalSetting,TOOLS_ONLY)
 ALL_SETTINGS+=$(call addOptionalSetting,INSANE)
@@ -263,4 +265,3 @@ ifdef OPENJDK
   ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JRE_FILE)
   ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_RELEASE_IMAGE)
 endif
-