summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-12-15 15:39:38 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-12-15 15:39:38 +0059
commit3e610548d72e8c97cfabc1f7d91a534cef3f73a5 (patch)
treebf3045d2210770fe69dd530fa8ac6fe472e50f92
parentadaaa24cd44e535ee241659c14951560170ceaf8 (diff)
manifests: (All) use Linaro branches of bluetooth/bluez and bluetooth/glib
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Change-Id: Id7fcdf64acb9aaa6d70217f32f4062c21f62dfde
-rw-r--r--default.xml4
-rw-r--r--landing-snowball.xml4
-rw-r--r--staging-iMX53.xml4
-rw-r--r--staging-origen.xml4
-rw-r--r--staging-panda.xml4
-rw-r--r--staging-snowball.xml4
-rw-r--r--staging-vexpress-a9.xml4
-rw-r--r--tracking-panda.xml4
8 files changed, 16 insertions, 16 deletions
diff --git a/default.xml b/default.xml
index f2da036..71bed50 100644
--- a/default.xml
+++ b/default.xml
@@ -65,6 +65,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -89,8 +91,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 526eda1..b797762 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -58,7 +58,6 @@
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
<project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
<project path="system/vold" name="platform/system/vold" revision="linaro_android_4.0.1"/>
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
<project path="bionic" name="platform/bionic" revision="linaro_android_4.0.1_snowball" />
<project path="external/srec" name="platform/external/srec" revision="linaro_android_4.0.1"/>
<project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.0.1"/>
@@ -70,6 +69,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -94,7 +95,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 933609a..c1ff1e8 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -66,6 +66,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -90,8 +92,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/staging-origen.xml b/staging-origen.xml
index ded7cf3..a3e0a36 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -59,7 +59,6 @@
<project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1_origen" />
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
<project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
<project path="system/vold" name="platform/system/vold" revision="linaro_android_4.0.1"/>
<project path="bionic" name="platform/bionic" revision="linaro_android_4.0.1"/>
<project path="external/srec" name="platform/external/srec" revision="linaro_android_4.0.1"/>
@@ -72,6 +71,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -96,7 +97,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 3acd273..3f90929 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -65,6 +65,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -89,8 +91,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index 9a59563..9a35554 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -58,7 +58,6 @@
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
<project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
<project path="system/vold" name="platform/system/vold" revision="linaro_android_4.0.1"/>
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
<project path="bionic" name="platform/bionic" revision="linaro_android_4.0.1" />
<project path="external/srec" name="platform/external/srec" revision="linaro_android_4.0.1"/>
<project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.0.1"/>
@@ -70,6 +69,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -94,7 +95,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml
index c3af4eb..ec9ddf8 100644
--- a/staging-vexpress-a9.xml
+++ b/staging-vexpress-a9.xml
@@ -67,6 +67,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -91,8 +93,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index cf05c9c..6be858b 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -65,6 +65,8 @@
<project path="frameworks/ex" name="platform/frameworks/ex" revision="linaro_android_4.0.1"/>
<project path="external/llvm" name="platform/external/llvm" revision="linaro_android_4.0.1"/>
<project path="external/clang" name="platform/external/clang" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="linaro_android_4.0.1"/>
+ <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="linaro_android_4.0.1"/>
<!-- AOSP -->
<project path="abi/cpp" name="platform/abi/cpp" />
@@ -89,8 +91,6 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
- <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
<project path="external/bluetooth/hcidump" name="platform/external/bluetooth/hcidump" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />