From 05317ce3cb275d31b1448b7a4a611b94992621f5 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Thu, 16 Aug 2012 13:06:40 +0200
Subject: manifests: (All) Use Linaro branch of dnsmasq

Fixes aliasing violations

Change-Id: I5b23754aad1a858435f3ac5c52cbf463b4bd0d7e
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 3c0fa44..657eed5 100644
--- a/default.xml
+++ b/default.xml
@@ -98,6 +98,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -119,7 +120,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/dnsmasq" name="platform/external/dnsmasq" 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" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index af265df..e99338e 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -115,6 +115,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 6b16bae..af54e4d 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -112,6 +112,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -125,7 +126,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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 1b89eea..253c2a8 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -90,6 +90,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -112,7 +113,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/dnsmasq" name="platform/external/dnsmasq" 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" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 13c0edb..113e3e4 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -112,6 +112,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/staging-panda.xml b/staging-panda.xml
index e25cc44..63c8ebc 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -110,6 +110,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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 -->
@@ -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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 1f5e8f4..e69ca90 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -123,6 +123,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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 -->
@@ -140,7 +141,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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 61dd27e..d82168d 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -122,6 +122,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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 -->
@@ -139,7 +140,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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 64ee534..53ebbf0 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -113,6 +113,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 44d150e..b8f2bb0 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -109,6 +109,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -126,7 +127,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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index cef7bd0..c303842 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -112,6 +112,7 @@
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.1.1"/>
   <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" />
   <!-- 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" />
@@ -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/dnsmasq" name="platform/external/dnsmasq" />
   <project path="external/ping" name="platform/external/ping" />
   <project path="external/ping6" name="platform/external/ping6" />
   <project path="external/tcpdump" name="platform/external/tcpdump" />
-- 
cgit v1.2.3