archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Chris Hegarty 2014-12-03 19:28:30 +00:00
commit 8d19b510dd
39 changed files with 928 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/CompileJavaModules.gmk
View file

@ -329,7 +329,7 @@ jdk.compiler_CLEAN_FILES := $(wildcard \
################################################################################
jdk.jcmd_COPY := _options
jdk.jcmd_COPY := _options
################################################################################
@ -433,8 +433,8 @@ GENERATED_SRC_DIRS += \
#
OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR))
OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
OS_TYPE_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_TYPE)/classes
endif
SHARE_SRC_DIRS += \
@ -448,7 +448,7 @@ SHARE_SRC_DIRS += \
ALL_SRC_DIRS = \
$(GENERATED_SRC_DIRS) \
$(OS_SRC_DIRS) \
$(OS_API_SRC_DIRS) \
$(OS_TYPE_SRC_DIRS) \
$(SHARE_SRC_DIRS) \
#
@ -470,7 +470,7 @@ define SetupModuleCompilation
$1_DEPS := $$(call FindDepsForModule, $1)
$1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
# When crypto classes are prebuilt, need to look for classes already in
# When crypto classes are prebuilt, need to look for classes already in
# output dir.
ifneq ($(BUILD_CRYPTO), true)
$1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1
@ -495,7 +495,7 @@ define SetupModuleCompilation
# Declare dependencies between java compilation of different modules.
# Since not all modules have been declared yet, or might be declared
# in different invocations of this file, use the macro to find the
# in different invocations of this file, use the macro to find the
# correct target file to depend on.
# Only the javac compilation actually depends on other modules so limit
# dependency declaration to that by using the *_COMPILE_TARGET variable.