--- a/javamanager/subsystem.mk Fri Jun 11 13:33:44 2010 +0300
+++ b/javamanager/subsystem.mk Wed Jun 23 18:07:10 2010 +0300
@@ -29,7 +29,6 @@
javalauncher/build
NONQTSUBSYSTEMS = \
- javasidchecker/build \
javarecognizer/build \
javaappschemeplugin/build
@@ -37,12 +36,19 @@
javaregistry \
javalauncher/build \
javabackup \
- javasidchecker/build \
javarecognizer/build \
preinstaller/build \
debugapi/build \
javaappschemeplugin/build
+ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
+NONQTSUBSYSTEMS += javasidchecker/build
+SYMBIAN_ONLY += javasidchecker/build
javasidchecker/build : javaregistry
+endif
+
+# Declare that release preparation removes subdirectories not in build, except
+# listed special cases
+REMOVE_NOTBUILT_EXCLUDING = inc
include ${JAVA_SRC_ROOT}/build/Makefile.subsystem