From 4289516e2660ef49d81cd72942cc3912203e5d07 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Thu, 16 Aug 2012 22:36:52 +0200
Subject: manifests: (All) Use Linaro version of ping

Fixes violations of aliasing rules

Change-Id: I629dbb9c219450cdfeb9498d8935d968cf172551
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   | 2 +-
 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            | 2 +-
 tracking-vexpress.xml         | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/default.xml b/default.xml
index 07dc61e..6111afd 100644
--- a/default.xml
+++ b/default.xml
@@ -102,6 +102,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/ping" name="platform/external/ping" 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 -->
@@ -121,7 +122,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/ping" name="platform/external/ping" 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" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index ae8c239..0027def 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -116,6 +116,7 @@
   <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="external/llvm" name="platform/external/llvm" />
@@ -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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 90cec5d..d7f415d 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -113,6 +113,7 @@
   <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="external/llvm" name="platform/external/llvm" />
@@ -127,7 +128,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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 181eece..3a4da95 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -91,6 +91,7 @@
   <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" />
@@ -114,7 +115,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/ping" name="platform/external/ping" 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" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 6cfe26c..8104afa 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -113,6 +113,7 @@
   <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="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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 157a94f..332a0c0 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -111,6 +111,7 @@
   <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" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
@@ -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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 6416461..90e7070 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -124,6 +124,7 @@
   <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" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
@@ -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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index fd66ed6..bad5458 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -123,6 +123,7 @@
   <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="external/e2fsprogs" name="platform/external/e2fsprogs" revision="linaro_android_4.1.1"/>
@@ -141,7 +142,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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 93017ce..1437493 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -114,6 +114,7 @@
   <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" />
@@ -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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 5755e6e..cfbafe6 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -113,6 +113,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/ping" name="platform/external/ping" 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" />
@@ -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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 601e713..4aab586 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -116,6 +116,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/ping" name="platform/external/ping" 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" />
@@ -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/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
   <project path="external/strace" name="platform/external/strace" />
-- 
cgit v1.2.3