From 73fa165e966df21d956f65f92233e1595a23f733 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Tue, 24 Jul 2012 00:44:28 +0159
Subject: manifest: (All with JB bits): Pull in Linaro version of system/core

Change-Id: Ic74f626573e087a5afcf79b56ceb870701ea8e3f
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml          | 5 +++--
 linaro-default.xml   | 5 +++--
 staging-panda.xml    | 5 +++--
 staging-vexpress.xml | 5 +++--
 tracking-panda.xml   | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/default.xml b/default.xml
index 3a8b22f..580496a 100644
--- a/default.xml
+++ b/default.xml
@@ -66,8 +66,9 @@
   <!-- Linaro modifications: Make sure we can find omapfb.h -->
   <!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: New init.rc, various bugfixes -->
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need porting -->
-  <project path="system/core" name="platform/system/core" revision="refs/tags/android-4.1.1_r3" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="refs/tags/android-4.1.1_r3" />
   <project path="system/vold" name="platform/system/vold"  revision="refs/tags/android-4.1.1_r3"/>
   <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers -->
@@ -119,7 +120,7 @@
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.1.1_r3" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: Set CPU specific compiler flags -->
+  <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
 
   <!-- TI proprietary-open -->
diff --git a/linaro-default.xml b/linaro-default.xml
index 6b0d2ca..d9ced25 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -85,13 +85,14 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: Set CPU specific compiler flags -->
+  <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: New init.rc, bug fixes -->
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="system/core" name="platform/system/core" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="system/vold" name="platform/system/vold" />
   <project path="external/srec" name="platform/external/srec" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 523e50b..7d14317 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -83,13 +83,14 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: Set CPU specific compiler flags -->
+  <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: New init.rc, assorted bug fixes -->
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="system/core" name="platform/system/core" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="system/vold" name="platform/system/vold" />
   <project path="external/srec" name="platform/external/srec" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 9e2736d..ab1777b 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -85,13 +85,14 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: Set CPU specific compiler flags -->
+  <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: New init.rc, assorted bug fixes -->
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="system/core" name="platform/system/core" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="system/vold" name="platform/system/vold" />
   <project path="external/srec" name="platform/external/srec" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index c011aa3..8c135b1 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -82,13 +82,14 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" />
-  <!-- Linaro modifications: Set CPU specific compiler flags -->
+  <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: New init.rc, assorted bug fixes -->
+  <project path="system/core" name="platform/system/core" revision="linaro_android_4.1.1" />
   <!-- Has Linaro modifications on 4.0.4 that may need porting -->
-  <project path="system/core" name="platform/system/core" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" />
   <project path="system/vold" name="platform/system/vold" />
   <project path="external/srec" name="platform/external/srec" />
-- 
cgit v1.2.3