Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk #1779

Closed
wants to merge 9 commits into from
+1,570 −562
Closed

8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk #1779

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6f7fbac
First step: break out Java settings to separate files
magicus Dec 15, 2020
d6bf82e
Only include the module Java.gmk file we need
magicus Dec 15, 2020
e6517d4
Move some more module-specific stuff to Java.gmk files
magicus Dec 15, 2020
6af5190
Remove debug code mistakenly pushed
magicus Dec 15, 2020
12b4d31
Remove module prefix from java variables
magicus Dec 15, 2020
09b5bee
$($(MODULE)_COPY_EXTRA) target is not used anymore
magicus Dec 15, 2020
1e1cb85
Rename DISABLED_WARNINGS to DISABLED_WARNINGS_java to avoid overwriti…
magicus Dec 15, 2020
a869f4b
Final bug fixes...
magicus Dec 15, 2020
6cb110a
Merge branch 'master' of https://git.openjdk.java.net/jdk into modula…
magicus Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions make/CompileJavaModules.gmk
View file
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ CreateHkTargets = \
################################################################################
# Include module specific build settings

-include $(TOPDIR)/make/module/$(MODULE)/Java.gmk
-include $(TOPDIR)/make/modules/$(MODULE)/Java.gmk

################################################################################
# Setup the main compilation
@@ -103,7 +103,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
CLEAN := $(CLEAN), \
CLEAN_FILES := $(CLEAN_FILES), \
COPY := $(COPY), \
DISABLED_WARNINGS_java := $(DISABLED_WARNINGS_java), \
DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
EXCLUDES := $(EXCLUDES), \
EXCLUDE_FILES := $(EXCLUDE_FILES), \
KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \