"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: 5/04/2007
Project: SymbianMmf
ErrorId: REQ#107-25484
Synopsis: CR: Changes for the Include Hierarchy
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
These paths are added to symbian-winscw-emulator.cf and
symbian-armv5.cf under a new macro HELIX_CONFIG_INC_HIERARCHY_CHANGE for
ribosome build.
The HELIX_CONFIG_INC_HIERARCHY_CHANGE macro definition
is added to helix-client-s60-32-common.pfi file.
For 5.0 (Taco) RIHC (Rest of Include Hierarchy Change)
is being phased-in at present.
Eventually 3.2 will also have this Include Hierarchy
Change. This is the reason for using the existing
helix-client-s60-32-common.pfi rather
than creating one for 5.0
Root Cause of the problem: New Requirement
Files Modified:
umakecf/symbian-armv5.cf
umakecf/symbian-emulator-winscw.cf
umakepf/helix-client-s60-32-common.pfi
Files Added: None
Image Size and Heap Use impact: None
Module Release testing (STIF) : Not required since
change is only build level.
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: umakecf/symbian-armv5.cf
===================================================================
RCS file:
/cvsroot/ribosome/build/umakecf/symbian-armv5.cf,v
retrieving revision 1.16
diff -w -u -b -r1.16 symbian-armv5.cf
--- umakecf/symbian-armv5.cf 6 Apr 2007 04:03:09
-0000 1.16
+++ umakecf/symbian-armv5.cf 4 May 2007 21:37:56
-0000
@@ -156,6 +156,12 @@
'EPOC32\INCLUDE\VARIANT',
'EPOC32\INCLUDE\RVCT2_2' ]
+ if
project.IsDefined('HELIX_CONFIG_INC_HIERARCHY_CHANGE'):
+ incs.append('epoc32\include\middleware')
+ incs.append('epoc32\include\domain\middleware')
+
incs.append('epoc32\include\domain\osextensions')
+ incs.append('epoc32\include\osextensions')
+
return incs
def GetArmv5CommonCompilerOptions():
Index: umakecf/symbian-emulator-winscw.cf
===================================================================
RCS file:
/cvsroot/ribosome/build/umakecf/symbian-emulator-winscw.cf,v
retrieving revision 1.16
diff -w -u -b -r1.16 symbian-emulator-winscw.cf
--- umakecf/symbian-emulator-winscw.cf 8 Feb 2007
09:08:27 -0000 1.16
+++ umakecf/symbian-emulator-winscw.cf 4 May 2007
21:37:56 -0000
@@ -148,6 +148,12 @@
'EPOC32\INCLUDE\mmf\common',
'EPOC32\INCLUDE\mmf\server' ]
+ if
project.IsDefined('HELIX_CONFIG_INC_HIERARCHY_CHANGE'):
+ incs.append('epoc32\include\osextensions')
+ incs.append('epoc32\include\middleware')
+ incs.append('epoc32\include\domain\middleware')
+
incs.append('epoc32\include\domain\osextensions')
+
return incs
cvs diff: Diffing umakepf
Index: umakepf/helix-client-s60-32-common.pfi
===================================================================
RCS file:
/cvsroot/ribosome/build/umakepf/helix-client-s60-32-common.pfi,v
retrieving revision 1.6
diff -w -u -b -r1.6 helix-client-s60-32-common.pfi
--- umakepf/helix-client-s60-32-common.pfi 5 Apr
2007 18:40:48 -0000 1.6
+++ umakepf/helix-client-s60-32-common.pfi 4 May
2007 21:37:56 -0000
@@ -69,5 +69,6 @@
project.AddDefines('HELIX_FEATURE_S60_PROGDOWN')
project.AddDefines('HELIX_FEATURE_S60_VIDEO_CUSTOM_INTERFACE')
project.AddDefines('HELIX_FEATURE_SYMBIAN_MDF_AUDIO_DSP_EAACPLUS')
+project.AddDefines('HELIX_CONFIG_INC_HIERARCHY_CHANGE')
exec_profile_file("helix-s60-metadataengine.pfi")
_______________________________________________
Audio-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/audio-dev
