7163471: Licensee source bundle failed around 7u4

Reviewed-by: dholmes, sla, brutisso, erikj
This commit is contained in:
Nils Loodin 2012-06-05 13:43:39 +02:00
parent dd23946ec9
commit cbe6d65df3

View File

@ -30,6 +30,22 @@ PRODUCT = oracle
#SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path
include $(BUILDDIR)/common/Defs.gmk
JFR_SRCDIRS_EXIST := $(shell \
if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \
echo true; \
else \
echo false; \
fi)
JFR =
ifndef OPENJDK
ifndef JAVASE_EMBEDDED
ifeq ($(JFR_SRCDIRS_EXIST), true)
JFR = jfr
endif
endif
endif
# build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds
UCRYPTO =
ifndef OPENJDK
@ -38,13 +54,6 @@ ifndef OPENJDK
endif
endif
JFR =
ifndef OPENJDK
ifndef JAVASE_EMBEDDED
JFR = jfr
endif
endif
SUBDIRS = $(JFR) net nio util $(UCRYPTO)
include $(BUILDDIR)/common/Subdirs.gmk