-----Original Message----- From: ext Greg Wright [mailto:[EMAIL PROTECTED] Sent: Tuesday, May 01, 2007 2:40 PM To: Thimmashetty Praveen (EXT-AdvantageTech-MSW/Dallas) Cc: [email protected]; [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED] Subject: Re: [Client-dev] CR-Client: Changes for the Include Hierarchy
looks good. --greg. [EMAIL PROTECTED] wrote: > "Nokia submits this code under the terms of a commercial contribution > agreement with RealNetworks, and I am authorized to contribute this > code under said agreement." > > Modified by: [EMAIL PROTECTED] > > Reviewed by: > > Date: 4/30/2007 > > Project: SymbianMmf > > ErrorId: REQ#107-25484 > > Synopsis: Since epoc32\include\oem is one of the system include path > in the existing build system, there is no need to explicitly specify > oem while including header files which are under oem directory. Due to > Rest of include hierarchy change implementation, there is a change in > header files location under epoc32\include. Hence looking for a header > file under specific directory has been taken out. These files have > moved to the directories within epoc32/include/ e.g. > > epoc32\include\middleware > epoc32\include\domain\middleware > epoc32\include\domain\osextensions > epoc32\include\osextensions > > For the MMP build system these directories are specified in the MACRO: > MW_LAYER_SYSTEMINCLUDE > which is included in all the MMP files. > > The changes for the Helix Build System will be presented in another CR. > This change does not cause the current helix build system to fail. > > > Root Cause of the problem: New Requirement > > > Files Modified: > > audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp > audio/device/platform/symbian/common/CHXBaseAudioSession.cpp > client/netwksvc/platform/symbian/hxsymbianapman.cpp > clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp > clientapps/symbianMmf/common/hxmmfbasectrl.cpp > datatype/mdf/video/renderer/mdfvideoadapter.cpp > > > > > Files Added: None > > > Image Size and Heap Use impact: None > > Module Release testing (STIF) : Not required since change is only > build level. Verified build with MMP build system. > > Test case(s) Added : N/A > > Memory leak check performed : No Build related changes only. > > Platforms and Profiles Build Verified: helix-client-s60-32-mmf-mdf-dsp > > Platforms and Profiles Functionality verified: armv5, winscw > > Branch: Head & 210CayS > > Index: > audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp > =================================================================== > RCS file: > /cvsroot/audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf. > cp > p,v > retrieving revision 1.14.2.6 > diff -w -u -b -r1.14.2.6 audio_session-mmf.cpp > --- audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp > 3 Apr 2007 18:33:10 -0000 1.14.2.6 > +++ audio/device/platform/symbian/audiosvr/mmf/audio_session-mmf.cpp > 1 May 2007 16:05:35 -0000 > @@ -62,7 +62,7 @@ > #include "hxtlogutil.h" > #include <e32std.h> > #if defined(HELIX_FEATURE_DRM_SECURE_OUTPUT) > - #include <oem\AudioOutput.h> > + #include <AudioOutput.h> > #endif > > > Index: audio/device/platform/symbian/common/CHXBaseAudioSession.cpp > =================================================================== > RCS file: > /cvsroot/audio/device/platform/symbian/common/CHXBaseAudioSession.cpp, > v > retrieving revision 1.1.2.1 > diff -w -u -b -r1.1.2.1 CHXBaseAudioSession.cpp > --- audio/device/platform/symbian/common/CHXBaseAudioSession.cpp > 13 Apr 2007 23:27:28 -0000 1.1.2.1 > +++ audio/device/platform/symbian/common/CHXBaseAudioSession.cpp > 1 May 2007 16:05:35 -0000 > @@ -65,7 +65,7 @@ > #include "CHXMMFDevSound.h" > #include "symbian_gm_inst.h" > #if defined(HELIX_FEATURE_DRM_SECURE_OUTPUT) > - #include <oem\AudioOutput.h> > + #include <AudioOutput.h> > #endif > > > Index: client/netwksvc/platform/symbian/hxsymbianapman.cpp > =================================================================== > RCS file: > /cvsroot/client/netwksvc/platform/symbian/hxsymbianapman.cpp,v > retrieving revision 1.7.2.10 > diff -w -u -b -r1.7.2.10 hxsymbianapman.cpp > --- client/netwksvc/platform/symbian/hxsymbianapman.cpp 9 Feb 2007 > 15:51:36 -0000 1.7.2.10 > +++ client/netwksvc/platform/symbian/hxsymbianapman.cpp 1 May 2007 > 16:05:39 -0000 > @@ -58,7 +58,7 @@ > > #if defined(HELIX_FEATURE_SYMBIAN_MMF) && > defined(HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY) > #include <etelpckt.h>//just for error codes -#include > <oem/gsmerror.h>//just for error codes > +#include <gsmerror.h>//just for error codes > #endif > > const UINT32 DefaultNumOfRetries = 1; /* Number of connect retries > before > Index: clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp > =================================================================== > RCS file: > /cvsroot/clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp,v > retrieving revision 1.1.2.8 > diff -w -u -b -r1.1.2.8 hxmmfaudioctrl.cpp > --- clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp 25 Apr > 2007 20:25:45 -0000 1.1.2.8 > +++ clientapps/symbianMmf/audiocontroller/hxmmfaudioctrl.cpp 1 May > 2007 16:05:52 -0000 > @@ -55,7 +55,7 @@ > #include <mmf/server/MmfUrl.h> > #include <mmf/common/MmfErrors.h> > #include <mmfropcustomcommandconstants.h> -#include <oem/Oma2Dcf.h> > +#include <Oma2Dcf.h> > > // > // Helix includes > Index: clientapps/symbianMmf/common/hxmmfbasectrl.cpp > =================================================================== > RCS file: /cvsroot/clientapps/symbianMmf/common/hxmmfbasectrl.cpp,v > retrieving revision 1.1.2.17 > diff -w -u -b -r1.1.2.17 hxmmfbasectrl.cpp > --- clientapps/symbianMmf/common/hxmmfbasectrl.cpp 18 Apr 2007 > 17:53:35 -0000 1.1.2.17 > +++ clientapps/symbianMmf/common/hxmmfbasectrl.cpp 1 May 2007 > 16:05:53 -0000 > @@ -52,8 +52,8 @@ > #include <mmf/server/MmfUrl.h> > #include <mmf/common/MmfErrors.h> > #include <mmfropcustomcommandconstants.h> -#include <oem/Oma2Dcf.h> > -#include <oem/SystemWarningLevels.hrh> > +#include <Oma2Dcf.h> > +#include <SystemWarningLevels.hrh> > #include <CustomInterfaceBuilder.h> > #include <CustomInterfaceCustomCommandParser.h> > > Index: datatype/mdf/video/renderer/mdfvideoadapter.cpp > =================================================================== > RCS file: /cvsroot/datatype/mdf/video/renderer/mdfvideoadapter.cpp,v > retrieving revision 1.3.2.61 > diff -w -u -b -r1.3.2.61 mdfvideoadapter.cpp > --- datatype/mdf/video/renderer/mdfvideoadapter.cpp 27 Apr 2007 > 15:37:26 -0000 1.3.2.61 > +++ datatype/mdf/video/renderer/mdfvideoadapter.cpp 1 May 2007 > 16:06:06 -0000 > @@ -49,7 +49,7 @@ > * ***** END LICENSE BLOCK ***** */ > > #if defined(HELIX_FEATURE_DRM_SECURE_OUTPUT) > - #include <oem/secureoutputci.h> > + #include <secureoutputci.h> > #endif > > #include "mdfvideoadapter.h" > > _______________________________________________ > Client-dev mailing list > [EMAIL PROTECTED] > http://lists.helixcommunity.org/mailman/listinfo/client-dev _______________________________________________ Audio-dev mailing list [email protected] http://lists.helixcommunity.org/mailman/listinfo/audio-dev
