equal
deleted
inserted
replaced
28 #SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true |
28 #SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true |
29 #SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true |
29 #SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true |
30 #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path |
30 #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path |
31 include $(BUILDDIR)/common/Defs.gmk |
31 include $(BUILDDIR)/common/Defs.gmk |
32 |
32 |
|
33 JFR_SRCDIRS_EXIST := $(shell \ |
|
34 if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \ |
|
35 echo true; \ |
|
36 else \ |
|
37 echo false; \ |
|
38 fi) |
|
39 |
|
40 JFR = |
|
41 ifndef OPENJDK |
|
42 ifndef JAVASE_EMBEDDED |
|
43 ifeq ($(JFR_SRCDIRS_EXIST), true) |
|
44 JFR = jfr |
|
45 endif |
|
46 endif |
|
47 endif |
|
48 |
33 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds |
49 # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds |
34 UCRYPTO = |
50 UCRYPTO = |
35 ifndef OPENJDK |
51 ifndef OPENJDK |
36 ifeq ($(PLATFORM), solaris) |
52 ifeq ($(PLATFORM), solaris) |
37 UCRYPTO = security/ucrypto |
53 UCRYPTO = security/ucrypto |
38 endif |
54 endif |
39 endif |
|
40 |
|
41 JFR = |
|
42 ifndef OPENJDK |
|
43 ifndef JAVASE_EMBEDDED |
|
44 JFR = jfr |
|
45 endif |
|
46 endif |
55 endif |
47 |
56 |
48 SUBDIRS = $(JFR) net nio util $(UCRYPTO) |
57 SUBDIRS = $(JFR) net nio util $(UCRYPTO) |
49 |
58 |
50 include $(BUILDDIR)/common/Subdirs.gmk |
59 include $(BUILDDIR)/common/Subdirs.gmk |