summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-08-19 20:33:38 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-08-19 20:33:38 +0000
commit63dc2b23ac88b4612689ed22bfd4f0f4259e6697 (patch)
tree9f1a7dae750a2c7cf1d59438631f17bdc3bf529f
parent2e5707dd21cf898d498dbc9d248a9cd3402ee86f (diff)
parentdb7395dd55117aeb6fc9fc0984358dbd32259d83 (diff)
downloadmanifest-63dc2b23ac88b4612689ed22bfd4f0f4259e6697.tar.gz
Merge "manifest: (All) Use Linaro version of tcpdump" into linaro_android_4.1.1
-rw-r--r--default.xml2
-rw-r--r--landing-snowball.xml2
-rw-r--r--linaro-default.xml2
-rw-r--r--staging-galaxynexus.xml2
-rw-r--r--staging-origen.xml2
-rw-r--r--staging-panda.xml2
-rw-r--r--staging-vexpress-rtsm-isw.xml2
-rw-r--r--staging-vexpress-rtsm.xml2
-rw-r--r--staging-vexpress.xml2
-rw-r--r--tracking-panda.xml2
-rw-r--r--tracking-vexpress.xml2
11 files changed, 11 insertions, 11 deletions
diff --git a/default.xml b/default.xml
index 2add428..9786217 100644
--- a/default.xml
+++ b/default.xml
@@ -109,6 +109,7 @@
<!-- Linaro modifications: Use -fno-strict-aliasing -->
<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="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need to be restored -->
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
@@ -123,7 +124,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/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" />
<project path="external/webkit" name="platform/external/webkit" revision="refs/tags/android-4.1.1_r4" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 263cadd..9dd6919 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -122,6 +122,7 @@
<project path="external/llvm" name="platform/external/llvm" />
<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="external/tcpdump" name="platform/external/tcpdump" 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" />
@@ -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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 37409db..00a7adb 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -119,6 +119,7 @@
<project path="external/llvm" name="platform/external/llvm" />
<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="external/tcpdump" name="platform/external/tcpdump" 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" />
@@ -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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 715f094..9cba0e8 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -101,6 +101,7 @@
<!-- Linaro modifications: Use -fno-strict-aliasing -->
<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="external/tcpdump" name="platform/external/tcpdump" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: need to be restored -->
<project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
@@ -116,7 +117,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/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" />
<project path="external/webkit" name="platform/external/webkit" revision="refs/tags/android-4.1.1_r4" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 8cf7825..cf081fa 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -121,6 +121,7 @@
<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/tcpdump" name="platform/external/tcpdump" 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" />
@@ -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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 10d65c7..ed8bd8d 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -115,6 +115,7 @@
<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" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" 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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 8351e6a..7f73519 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -128,6 +128,7 @@
<!-- 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" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" 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" />
@@ -144,7 +145,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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index d3a14fc..1607fb1 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -128,6 +128,7 @@
<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" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" 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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 2f6bfe0..da9843f 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -119,6 +119,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/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" 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" />
@@ -134,7 +135,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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index e6015b5..71a118c 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -115,6 +115,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/ping6" name="platform/external/ping6" revision="linaro_android_4.1.1" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" 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" />
@@ -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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 83b8157..5d70c24 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -118,6 +118,7 @@
<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" />
+ <project path="external/tcpdump" name="platform/external/tcpdump" 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/tcpdump" name="platform/external/tcpdump" />
<project path="external/strace" name="platform/external/strace" />
<project path="packages/apps/Camera" name="platform/packages/apps/Camera" />
<project path="external/webkit" name="platform/external/webkit" />