changeset 5216:0128a8d8c0b4

7168098: Adjustments for SE-Embedded build process Reviewed-by: dholmes Contributed-by: Gary Collins <gary.collins@oracle.com>
author dholmes
date Thu, 10 May 2012 23:56:22 -0400
parents 8004f3dd5c54
children ab8bb05a32c7
files make/com/oracle/Makefile make/common/Defs-embedded.gmk
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/oracle/Makefile	Fri May 11 10:46:51 2012 -0700
+++ b/make/com/oracle/Makefile	Thu May 10 23:56:22 2012 -0400
@@ -40,10 +40,12 @@
 
 JFR =
 ifndef OPENJDK
-ifndef JAVASE_EMBEDDED
+ifndef JAVASE_EMBEDDED 
+ifneq (${ARCH},arm)
 	JFR = jfr
 endif
 endif
+endif
 
 SUBDIRS = $(JFR) net nio util $(UCRYPTO)
 
--- a/make/common/Defs-embedded.gmk	Fri May 11 10:46:51 2012 -0700
+++ b/make/common/Defs-embedded.gmk	Thu May 10 23:56:22 2012 -0400
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,8 @@
   endif
 endif
 
+endif # JAVASE_EMBEDDED
+ifeq ($(ZERO_BUILD), )
 # NIO Platform specific source file location
 ifdef CROSS_COMPILE_ARCH
   NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/
@@ -71,6 +73,5 @@
 ifeq ($(CROSS_COMPILE_ARCH), arm)
   EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
 endif 
+endif
 
-endif # JAVASE_EMBEDDED
-