diff -r 7cee158cb8cd -r 26b2b12093af javauis/amms_akn/build/javaamms_0x2002DC96.mmp
--- a/javauis/amms_akn/build/javaamms_0x2002DC96.mmp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javauis/amms_akn/build/javaamms_0x2002DC96.mmp	Wed Oct 13 14:23:59 2010 +0300
@@ -48,7 +48,6 @@
 MACRO		RD_JAVA_HTTP_EMC_ENABLED
 MACRO		RD_JAVA_NGA_ENABLED
 MACRO		RD_JAVA_PROXIMITY_LISTENER_ENABLED
-MACRO		RD_JAVA_PIM_MULTICAL_ENABLED
 MACRO		RD_JAVA_OPENC_BETA_PATCH
 MACRO		RD_JAVA_INSTALLERUI_ENABLED
 MACRO		RD_JAVA_PREWARM
@@ -56,8 +55,11 @@
 MACRO		RD_JAVA_MIDPRMS_DB
 MACRO		__SYMBIAN32__
 MACRO		J9EPOC32
+MACRO		RD_JAVA_OMJ_FSERVER
 
 SYSTEMINCLUDE		../../../../../mw/qt/mkspecs/common/symbian
+SYSTEMINCLUDE		/epoc32/include/mmf/common
+SYSTEMINCLUDE		/epoc32/include/caf
 SYSTEMINCLUDE		../ammscontrol/inc
 SYSTEMINCLUDE		../ammscontrol/audio3D/inc
 SYSTEMINCLUDE		../ammscontrol/audioeffect/inc
@@ -65,7 +67,10 @@
 SYSTEMINCLUDE		../module/inc
 SYSTEMINCLUDE		../src_tuner/native/external_include
 SYSTEMINCLUDE		../src_tuner/native/inc
+SYSTEMINCLUDE		../../mmapi_akn/baseline/inc
+SYSTEMINCLUDE		../../mmapi_akn/baseline/inc.emc
 SYSTEMINCLUDE		../mmacontrol/inc.emc
+SYSTEMINCLUDE		../../mmapi_akn/baseline/inc.nga
 SYSTEMINCLUDE		../../inc
 SYSTEMINCLUDE		../../../inc
 SYSTEMINCLUDE		../ammscontrol/src
@@ -180,14 +185,14 @@
 LIBRARY		AudioEqualizerUtility.lib
 LIBRARY		CustomCommandUtility.lib
 LIBRARY		DistanceAttenuationEffect.lib
-LIBRARY		Dopplerbase.lib
+LIBRARY		DopplerBase.lib
 LIBRARY		EnvironmentalReverbEffect.lib
 LIBRARY		EnvironmentalReverbUtility.lib
 LIBRARY		ListenerDopplerEffect.lib
 LIBRARY		ListenerLocationEffect.lib
 LIBRARY		ListenerOrientationEffect.lib
 LIBRARY		LocationBase.lib
-LIBRARY		mediaclientaudio.lib
+LIBRARY		MediaClientAudio.lib
 LIBRARY		OrientationBase.lib
 LIBRARY		RoomLevelEffect.lib
 LIBRARY		SourceDopplerEffect.lib
@@ -214,6 +219,7 @@
 LIBRARY		libdl.lib
 LIBRARY		cone.lib
 LIBRARY		eikcore.lib
+LIBRARY		mediaclientaudio.lib
 LIBRARY		eikcoctl.lib
 LIBRARY		eiksrv.lib
 LIBRARY		apparc.lib
@@ -234,7 +240,7 @@
 #endif
 OPTION GCCE -fvisibility-inlines-hidden
 
-VERSION 10.525
+VERSION 10.0
 
 ARMFPU softvfp