From ae2fe853b61d72e1561940600f70c0fa66de133c Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Mon, 15 Oct 2012 01:05:17 +0200
Subject: manifest: (All) Use Linaro branch of hardware/ril

Needed to fix build after getting in the Parcel ABI fix

Change-Id: Id39b5d83a2997a78665341ff7018b7c1c7b2d290
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 2 +-
 landing-snowball.xml          | 2 +-
 linaro-default.xml            | 2 +-
 staging-galaxynexus.xml       | 2 +-
 staging-origen.xml            | 2 +-
 staging-panda.xml             | 2 +-
 staging-vexpress-rtsm-isw.xml | 2 +-
 staging-vexpress-rtsm.xml     | 2 +-
 staging-vexpress.xml          | 2 +-
 tracking-origen.xml           | 2 +-
 tracking-panda.xml            | 2 +-
 tracking-snowball.xml         | 2 +-
 tracking-vexpress-lw.xml      | 2 +-
 tracking-vexpress-rtsm-mp.xml | 2 +-
 tracking-vexpress-tests.xml   | 2 +-
 tracking-vexpress.xml         | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/default.xml b/default.xml
index f8aacbb..b146feb 100644
--- a/default.xml
+++ b/default.xml
@@ -122,6 +122,7 @@
   <!-- Linaro modifications: ISO C++ 11 support -->
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Need porting -->
   <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.2_r1" />
   <!-- Linaro modifications: Add ECM -->
@@ -297,7 +298,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 81a75ae..89a8928 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -148,6 +148,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -303,7 +304,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/linaro-default.xml b/linaro-default.xml
index bb9bbc9..92c0575 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -145,6 +145,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -302,7 +303,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index bf0a5a3..4429d6c 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -124,6 +124,7 @@
   <!-- Linaro modifications: ISO C++11 support -->
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.1.2" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.1.2" />
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.2" />
   <!-- Linaro modifications: need to be restored -->
@@ -291,7 +292,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/staging-origen.xml b/staging-origen.xml
index d80e773..645c763 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -147,6 +147,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -302,7 +303,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/staging-panda.xml b/staging-panda.xml
index f67aaaf..517cd99 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -149,6 +149,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -299,7 +300,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 8cae081..8e6d861 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -160,6 +160,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -310,7 +311,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index ccecbce..d14cf69 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -159,6 +159,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -309,7 +310,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index b636e62..e93ff30 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -151,6 +151,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -301,7 +302,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 47360e8..032c69f 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -145,6 +145,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -298,7 +299,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index fe6787e..cbf1ca2 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -148,6 +148,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -298,7 +299,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index e8199be..8312b23 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -146,6 +146,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.1.2" />
@@ -299,7 +300,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking-vexpress-lw.xml b/tracking-vexpress-lw.xml
index 8aff84e..01d0f9a 100644
--- a/tracking-vexpress-lw.xml
+++ b/tracking-vexpress-lw.xml
@@ -153,6 +153,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -304,7 +305,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index 073a826..8ffccd0 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -156,6 +156,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -306,7 +307,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index 16280dd..16886ea 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -156,6 +156,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -306,7 +307,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 8329258..7145509 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -152,6 +152,7 @@
   <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/gtest" name="platform/external/gtest" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
+  <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.1.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -302,7 +303,6 @@
   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" />
   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" />
-  <project path="hardware/ril" name="platform/hardware/ril" />
   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
-- 
cgit v1.2.1