From 54c1fb147d0a36d272525c99cb64e81fbfa4048a 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:39:55 +0100
Subject: manifest: Use Linaro branch of gtest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It fixes gcc 4.8 build issues

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

diff --git a/default.xml b/default.xml
index a59ab91..6e1105b 100644
--- a/default.xml
+++ b/default.xml
@@ -184,13 +184,13 @@
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" groups="common" />
   <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" groups="common" />
   <project path="external/libvpx" name="platform/external/libvpx" groups="common" />
-  <project path="external/gtest" name="platform/external/gtest" groups="common" />
   <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.2" groups="common" />
   <!-- 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" />
+  <project path="external/gtest" name="platform/external/gtest" 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" />
diff --git a/tracking-origen-quad.xml b/tracking-origen-quad.xml
index d68f318..56ec613 100644
--- a/tracking-origen-quad.xml
+++ b/tracking-origen-quad.xml
@@ -153,7 +153,6 @@
   <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" />
   <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.2.2" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
@@ -164,6 +163,7 @@
   <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" />
+  <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.2.2" />
 
   <!-- TI proprietary-open -->
   <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" />
-- 
cgit v1.2.3