diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-02-17 09:29:58 +0059 |
---|---|---|
committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-02-17 09:29:58 +0059 |
commit | c9492e8caa58ef7b3f2b09d5307aa0267e941da4 (patch) | |
tree | 7e9b051fb10ca3119f2b26cbd153f73831fcebd2 | |
parent | 40cd075976b1844cfff841fd179094591f10504e (diff) |
manifest: (All) Use Linaro version of gtest
The only difference between Linaro and upstream is that
the Linaro version compiles with gcc 4.7
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | default.xml | 2 | ||||
-rw-r--r-- | landing-panda.xml | 2 | ||||
-rw-r--r-- | landing-snowball.xml | 2 | ||||
-rw-r--r-- | staging-iMX53.xml | 2 | ||||
-rw-r--r-- | staging-iMX6.xml | 2 | ||||
-rw-r--r-- | staging-origen.xml | 2 | ||||
-rw-r--r-- | staging-panda.xml | 2 | ||||
-rw-r--r-- | staging-snowball.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-a9.xml | 2 | ||||
-rw-r--r-- | tracking-panda.xml | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/default.xml b/default.xml index eeacaf6..bfd8058 100644 --- a/default.xml +++ b/default.xml @@ -32,6 +32,7 @@ <project path="external/powertop" name="platform/external/powertop" revision="linaro"/> <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/> <project path="external/libnl" name="platform/external/libnl" revision="linaro"/> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- Make sure only one of the kernels is enabled! --> <!-- Linaro kernel --> @@ -130,7 +131,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/landing-panda.xml b/landing-panda.xml index 95a353a..581b5d7 100644 --- a/landing-panda.xml +++ b/landing-panda.xml @@ -80,6 +80,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -134,7 +135,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/landing-snowball.xml b/landing-snowball.xml index 4feec53..2a56d20 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -81,6 +81,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -133,7 +134,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/staging-iMX53.xml b/staging-iMX53.xml index c581e18..ae71917 100644 --- a/staging-iMX53.xml +++ b/staging-iMX53.xml @@ -78,6 +78,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -130,7 +131,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/staging-iMX6.xml b/staging-iMX6.xml index 8fc22ce..e69135f 100644 --- a/staging-iMX6.xml +++ b/staging-iMX6.xml @@ -80,6 +80,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -132,7 +133,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/staging-origen.xml b/staging-origen.xml index 9c9a4d2..db6dad9 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -83,6 +83,7 @@ <project path="system/bluetooth" name="platform/system/bluetooth" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -135,7 +136,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/staging-panda.xml b/staging-panda.xml index 8a9e867..4b2906c 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -77,6 +77,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -129,7 +130,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/staging-snowball.xml b/staging-snowball.xml index 3b7c5c0..2cd3739 100644 --- a/staging-snowball.xml +++ b/staging-snowball.xml @@ -81,6 +81,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -133,7 +134,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml index bec58d8..38c6cce 100644 --- a/staging-vexpress-a9.xml +++ b/staging-vexpress-a9.xml @@ -80,6 +80,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -132,7 +133,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index e393234..1358380 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -77,6 +77,7 @@ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.0.3" /> <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="members-meeting-demo"/> <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> + <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <!-- TI proprietary-open --> @@ -130,7 +131,6 @@ <project path="external/giflib" name="platform/external/giflib" /> <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" /> <project path="external/grub" name="platform/external/grub" /> - <project path="external/gtest" name="platform/external/gtest" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/hyphenation" name="platform/external/hyphenation" /> |