--- a/javacommons/jvms/subsystem.mk	Fri Sep 17 16:44:34 2010 +0300
+++ b/javacommons/jvms/subsystem.mk	Mon Oct 04 11:29:25 2010 +0300
@@ -18,10 +18,19 @@
 
 COMPONENTS = \
 	nativeportlayer/build \
-	j9utils/threaddump/build \
-	j9
+	j9utils/threaddump/build
+
+# Component j9 is needed only if the package hasn't been split
+ifndef RD_JAVA_PKG_SPLIT
+   COMPONENTS += j9
+endif    
 
 SYMBIAN_ONLY = nativeportlayer/build
 LINUX_ONLY = 
 
+# Declare that release preparation removes subdirectories not in build, except
+# listed special cases
+REMOVE_NOTBUILT_EXCLUDING = 
+
+
 include ${JAVA_SRC_ROOT}/build/Makefile.subsystem