# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1288186456 -3600
# Node ID 63655bb55cf3e948bd26f451a0830f57455f713c
# Parent  f5fa65621cac54e6a1cdba9fd18b4b6c668f333e
Update package models from latest system model  (platform@a6682a62bef3)

diff -r f5fa65621cac -r 63655bb55cf3 CompilerCompatibility/adapt/naviengine.nec/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CompilerCompatibility/adapt/naviengine.nec/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adapt" long-name="Adaptation" levels="low mw high">
+   <block name="naviengine.nec" level="low" long-name="NaviEngine" levels="hw-if">
+<collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
+<component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb"/>
+</component>
+<component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
+</component>
+<component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebspflexible"/>
+</component>
+<component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebootldr"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r f5fa65621cac -r 63655bb55cf3 CompilerCompatibility/os/lbs/package_definition.xml
--- a/CompilerCompatibility/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
+++ b/CompilerCompatibility/os/lbs/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -113,6 +113,10 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -125,6 +129,10 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
diff -r f5fa65621cac -r 63655bb55cf3 RCL_3/adapt/naviengine.nec/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/RCL_3/adapt/naviengine.nec/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adapt" long-name="Adaptation" levels="low mw high">
+   <block name="naviengine.nec" level="low" long-name="NaviEngine" levels="hw-if">
+<collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
+<component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb"/>
+</component>
+<component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
+</component>
+<component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebspflexible"/>
+</component>
+<component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebootldr"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r f5fa65621cac -r 63655bb55cf3 RCL_3/os/lbs/package_definition.xml
--- a/RCL_3/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
+++ b/RCL_3/os/lbs/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -113,6 +113,10 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -125,6 +129,10 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
diff -r f5fa65621cac -r 63655bb55cf3 symbian3/adapt/naviengine.nec/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adapt/naviengine.nec/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adapt" long-name="Adaptation" levels="low mw high">
+   <block name="naviengine.nec" level="low" long-name="NaviEngine" levels="hw-if">
+<collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
+<component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb"/>
+</component>
+<component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
+</component>
+<component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebspflexible"/>
+</component>
+<component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebootldr"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r f5fa65621cac -r 63655bb55cf3 symbian3/os/lbs/package_definition.xml
--- a/symbian3/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -113,6 +113,10 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -125,6 +129,10 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">
diff -r f5fa65621cac -r 63655bb55cf3 tip_bulk_s3/adapt/naviengine.nec/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tip_bulk_s3/adapt/naviengine.nec/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!ATTLIST component
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  deprecated CDATA #IMPLIED
+  introduced CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  plugin (Y|N) 'N'
+  filter CDATA #IMPLIED
+  class NMTOKENS #IMPLIED
+  supports CDATA #IMPLIED
+  purpose (optional|mandatory|development) 'optional'>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  mrp CDATA #IMPLIED
+  filter CDATA #IMPLIED
+  bldFile CDATA #IMPLIED
+  root CDATA #IMPLIED
+  version NMTOKEN #IMPLIED
+  prebuilt NMTOKEN #IMPLIED
+  late (Y|N) #IMPLIED
+  priority CDATA #IMPLIED>
+]>
+<SystemDefinition name="Symbian^3" schema="2.0.1">
+ <systemModel>
+  <layer name="adapt" long-name="Adaptation" levels="low mw high">
+   <block name="naviengine.nec" level="low" long-name="NaviEngine" levels="hw-if">
+<collection name="navienginebsp" long-name="NaviEngine BSP" level="hw-if">
+<component name="ne1_tb" long-name="NaviEngine 1 (Multiple)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb"/>
+</component>
+<component name="sne1_tb" long-name="NaviEngine 1 (Single)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebsp/ne1_tb/single"/>
+</component>
+<component name="fne1_tb" long-name="NaviEngine 1 (Flexible)" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebspflexible"/>
+</component>
+<component name="navienginebootldr" long-name="NaviEngine Boot Loader" introduced="^4" purpose="optional" filter="sf_build">
+<unit bldFile="/sf/adapt/naviengine.nec/navienginebootldr"/>
+</component>
+</collection>
+</block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r f5fa65621cac -r 63655bb55cf3 tip_bulk_s3/os/lbs/package_definition.xml
--- a/tip_bulk_s3/os/lbs/package_definition.xml	Wed Oct 27 11:33:43 2010 +0100
+++ b/tip_bulk_s3/os/lbs/package_definition.xml	Wed Oct 27 14:34:16 2010 +0100
@@ -113,6 +113,10 @@
 <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
+<component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
 <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
@@ -125,6 +129,10 @@
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
 </component>
+<component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface"/>
 <collection name="lbs_info" long-name="Locating Services Info" level="application-interface">