From 2801ec9737930ba92ea3f64b586f8c319657a3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
 <Bernhard.Rosenkranzer@linaro.org>
Date: Wed, 27 Mar 2013 14:22:13 +0100
Subject: manifest: Use the Linaro branch of bluedroid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It adds fixes for building with gcc 4.8

Change-Id: I1d7fbf7d57ee512a5058a02f39f71cabafcd1579
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml              | 3 ++-
 tracking-origen-quad.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/default.xml b/default.xml
index 17ba3aa..a59ab91 100644
--- a/default.xml
+++ b/default.xml
@@ -189,6 +189,8 @@
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.2" groups="common" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.2" groups="common" />
+  <!-- Linaro modification: Make it build with gcc 4.8 -->
+  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" revision="linaro_android_4.2.2" groups="common" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" groups="common" />
@@ -223,7 +225,6 @@
   <project path="external/astl" name="platform/external/astl" groups="common" />
   <project path="external/bison" name="platform/external/bison" groups="common" />
   <project path="external/blktrace" name="platform/external/blktrace" groups="common" />
-  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="common" />
   <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="common" />
   <project path="external/bsdiff" name="platform/external/bsdiff" groups="common" />
   <project path="external/bzip2" name="platform/external/bzip2" groups="common" />
diff --git a/tracking-origen-quad.xml b/tracking-origen-quad.xml
index 847c8ef..d68f318 100644
--- a/tracking-origen-quad.xml
+++ b/tracking-origen-quad.xml
@@ -162,6 +162,8 @@
   <!-- Linaro modification: ISO C++ 11 support -->
   <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.2.2" />
   <project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.2.2" />
+  <!-- Linaro modification: Make it build with gcc 4.8 -->
+  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" revision="linaro_android_4.2.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
@@ -196,7 +198,6 @@
   <project path="external/astl" name="platform/external/astl" />
   <project path="external/bison" name="platform/external/bison" />
   <project path="external/blktrace" name="platform/external/blktrace" />
-  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" />
   <project path="external/bouncycastle" name="platform/external/bouncycastle" />
   <project path="external/bsdiff" name="platform/external/bsdiff" />
   <project path="external/bzip2" name="platform/external/bzip2" />
-- 
cgit v1.2.3