From 40eed2a1328ed3e53533e0d9baeb101392a37141 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Thu, 16 Aug 2012 23:03:10 +0200
Subject: manifests: (All) Use Linaro version of ping6

Activates -fno-strict-aliasing locally so we don't need it globally

Change-Id: I26836c0130d5a012abea3d969d9f20bbb3bf9f02
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 4 ++--
 landing-snowball.xml          | 2 +-
 linaro-default.xml            | 2 +-
 staging-galaxynexus.xml       | 2 +-
 staging-origen.xml            | 2 +-
 staging-panda.xml             | 2 +-
 staging-vexpress-rtsm-isw.xml | 2 +-
 staging-vexpress-rtsm.xml     | 2 +-
 staging-vexpress.xml          | 2 +-
 tracking-panda.xml            | 4 ++--
 tracking-vexpress.xml         | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/default.xml b/default.xml
index 6111afd..2add428 100644
--- a/default.xml
+++ b/default.xml
@@ -99,10 +99,11 @@
   <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.1" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.1" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1"/>
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need to be restored -->
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
@@ -122,7 +123,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
   <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="refs/tags/android-4.1.1_r4" />
-  <project path="external/ping6" name="platform/external/ping6" revision="refs/tags/android-4.1.1_r4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="refs/tags/android-4.1.1_r4" />
   <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.1_r4" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="refs/tags/android-4.1.1_r4" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 0027def..263cadd 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -123,6 +123,7 @@
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
@@ -131,7 +132,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/linaro-default.xml b/linaro-default.xml
index d7f415d..37409db 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -120,6 +120,7 @@
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
@@ -128,7 +129,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 3a4da95..715f094 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -95,6 +95,7 @@
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1"/>
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need to be restored -->
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
@@ -115,7 +116,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="refs/tags/android-4.1.1_r4" />
   <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.1.1_r4" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" revision="refs/tags/android-4.1.1_r4" />
-  <project path="external/ping6" name="platform/external/ping6" revision="refs/tags/android-4.1.1_r4" />
   <project path="external/tcpdump" name="platform/external/tcpdump" revision="refs/tags/android-4.1.1_r4" />
   <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.1.1_r4" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="refs/tags/android-4.1.1_r4" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 8104afa..8cf7825 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -120,6 +120,7 @@
   <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
@@ -130,7 +131,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 332a0c0..10d65c7 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -112,6 +112,7 @@
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.1" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.1" />
   <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
@@ -130,7 +131,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 90e7070..8351e6a 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -127,6 +127,7 @@
   <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -143,7 +144,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index bad5458..d3a14fc 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -127,6 +127,7 @@
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -142,7 +143,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 1437493..2f6bfe0 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -118,6 +118,7 @@
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -133,7 +134,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index cfbafe6..e6015b5 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -110,10 +110,11 @@
   <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" revision="linaro_android_4.1.1" />
   <project path="external/chromium" name="platform/external/chromium" revision="linaro_android_4.1.1" />
   <project path="external/dnsmasq" name="platform/external/dnsmasq" revision="linaro_android_4.1.1" />
+  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: Use -fno-strict-aliasing -->
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
-  <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -129,7 +130,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 4aab586..83b8157 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -117,6 +117,7 @@
   <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.1.1" />
   <project path="external/ping" name="platform/external/ping" revision="linaro_android_4.1.1" />
+  <project path="external/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.1.1" />
   <project path="external/llvm" name="platform/external/llvm" />
@@ -132,7 +133,6 @@
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
   <project path="system/media" name="platform/system/media" />
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn" />
-  <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
-- 
cgit v1.2.3