提交 effbcb61 编写于 作者: N nloodin

7163471: Licensee source bundle failed around 7u4

Reviewed-by: dholmes, sla, brutisso, erikj
上级 71255e9a
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册