From 1004732653b62a2a3b3e7ee17591dd38012d77db Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
Date: Mon, 2 Jul 2012 13:18:58 +0200
Subject: manifest: (All) Use linkloader from linaro branch

Fixes linking issues

Change-Id: I42662069f066efb1d87b9870e544e497edafecfc
---
 default.xml                   | 2 +-
 fsl-iMX6.xml                  | 2 +-
 landing-panda.xml             | 2 +-
 landing-snowball.xml          | 2 +-
 staging-iMX53.xml             | 2 +-
 staging-iMX6.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.xml         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/default.xml b/default.xml
index 99c4cc0..b46a68e 100644
--- a/default.xml
+++ b/default.xml
@@ -94,6 +94,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -205,7 +206,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/fsl-iMX6.xml b/fsl-iMX6.xml
index ea53ea3..4b62b79 100644
--- a/fsl-iMX6.xml
+++ b/fsl-iMX6.xml
@@ -101,6 +101,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -212,7 +213,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/landing-panda.xml b/landing-panda.xml
index f190f31..e9bb2ff 100644
--- a/landing-panda.xml
+++ b/landing-panda.xml
@@ -101,6 +101,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -215,7 +216,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 881410a..33eb148 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -105,6 +105,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -216,7 +217,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
   <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 86d96fc..32c2b4a 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -99,6 +99,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -210,7 +211,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/staging-iMX6.xml b/staging-iMX6.xml
index 75e9bf6..75dd84b 100644
--- a/staging-iMX6.xml
+++ b/staging-iMX6.xml
@@ -101,6 +101,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -212,7 +213,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 13c5972..8f4b328 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -103,6 +103,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -214,7 +215,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/staging-panda.xml b/staging-panda.xml
index e41c911..135f5bc 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -99,6 +99,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -210,7 +211,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index f68d2ca..12c9a06 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -105,6 +105,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -216,7 +217,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 0743f94..8c31e88 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -104,6 +104,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -215,7 +216,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index a3adc29..453cb7d 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -100,6 +100,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -211,7 +212,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 2608845..524c74c 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -103,6 +103,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -214,7 +215,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 75c9f38..bfe7336 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -98,6 +98,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -209,7 +210,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index f66cbc3..ced23f5 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -103,6 +103,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -214,7 +215,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index b65d3b2..2ed7970 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -100,6 +100,7 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.0.4" />
   <project path="external/embunit" name="platform/external/embunit" revision="linaro_android_4.0.4" />
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.0.4" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="linaro_android_4.0.4" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -211,7 +212,6 @@
   <project path="external/xmlwriter" name="platform/external/xmlwriter" />
   <project path="external/yaffs2" name="platform/external/yaffs2" />
   <project path="external/zlib" name="platform/external/zlib" />
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" />
   <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" />
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" />
-- 
cgit v1.2.3