make/Bundles.gmk

*** 203,212 ****
--- 203,214 ----
                $(ALL_JDK_FILES) \
            ) \
        ) \
        $(call CacheFind, $(SYMBOLS_IMAGE_DIR))
  
+   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
+ 
    ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
  
    # Create special filter rules when dealing with unzipped .dSYM directories on
    # macosx
    ifeq ($(OPENJDK_TARGET_OS), macosx)
*** 262,271 ****
--- 264,284 ----
        UNZIP_DEBUGINFO := true, \
    ))
  
    PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE)
  
+   # The demo bundle is only created to support client tests. Ideally it should
+   # be built with the main test bundle, but since the prerequisites match
+   # better with the product build, it makes more sense to keep it there for now.
+   $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \
+       BUNDLE_NAME := $(TEST_DEMOS_BUNDLE_NAME), \
+       FILES := $(TEST_DEMOS_BUNDLE_FILES), \
+       BASE_DIRS := $(JDK_IMAGE_DIR), \
+       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+   ))
+ 
+   PRODUCT_TARGETS += $(BUILD_TEST_DEMOS_BUNDLE)
  endif
  
  ################################################################################
  
  ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), )