make/common/Modules.gmk

*** 1,7 ****
  #
! # Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 272,281 ****
--- 272,283 ----
  
  SPEC_SUBDIRS += share/specs
  
  MAN_SUBDIRS += share/man
  
+ TOOLS_SUBDIRS += share/tools
+ 
  # Find all module-info.java files for the current build target platform and
  # configuration.
  # Param 1 - Module to find for, set to * for finding all
  FindAllModuleInfos = \
      $(sort $(wildcard \
*** 336,345 ****
--- 338,354 ----
  # $1 - Module to find man dirs for
  FindModuleManDirs = \
      $(strip $(wildcard \
          $(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
  
+ # Find all tools directories for all modules for the current build target platform and
+ # configuration.
+ FindAllToolsDirs = \
+     $(sort $(wildcard \
+         $(foreach sub, $(TOOLS_SUBDIRS), \
+           $(patsubst %,%/*/$(sub), $(TOP_SRC_DIRS)))))
+ 
  # Construct the complete module source path
  GetModuleSrcPath = \
      $(call PathList, \
          $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
          $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))