summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-03-27 14:39:55 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-03-27 14:39:55 +0100
commit54c1fb147d0a36d272525c99cb64e81fbfa4048a (patch)
tree94d922831998b987e390a417ddc3bf956cd77b6e
parent2801ec9737930ba92ea3f64b586f8c319657a3a9 (diff)
downloadmanifests_sandbox-54c1fb147d0a36d272525c99cb64e81fbfa4048a.tar.gz
manifest: Use Linaro branch of gtest
It fixes gcc 4.8 build issues Change-Id: Ide4061530f42149d9edaeaff74f8b7210eed2a43 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--default.xml2
-rw-r--r--tracking-origen-quad.xml2
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" />