summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Pfeffer <zach.pfeffer@linaro.org>2012-08-23 11:11:18 -0500
committerZach Pfeffer <zach.pfeffer@linaro.org>2012-08-23 11:11:18 -0500
commit84d66644b895ee7657515d004a1e3b18a5db8d6e (patch)
tree826d805d215b58b54e83a4000362a7aff4c1d5f6
parentca83eb31349749622f1c3a6204645fb68c1ec7d0 (diff)
downloadmanifests_sandbox-84d66644b895ee7657515d004a1e3b18a5db8d6e.tar.gz
manifests: (All) Use Linaro branch of platform/packages/apps/Settings
This branch includes modifications for the Ethernet Configuration Manager (ECM). Signed-off-by: Zach Pfeffer <zach.pfeffer@linaro.org>
-rw-r--r--default.xml3
-rw-r--r--landing-snowball.xml3
-rw-r--r--linaro-default.xml3
-rw-r--r--staging-galaxynexus.xml3
-rw-r--r--staging-origen.xml3
-rw-r--r--staging-panda.xml3
-rw-r--r--staging-vexpress-rtsm-isw.xml3
-rw-r--r--staging-vexpress-rtsm.xml3
-rw-r--r--staging-vexpress.xml3
-rw-r--r--tracking-panda.xml3
-rw-r--r--tracking-snowball.xml3
-rw-r--r--tracking-vexpress.xml3
12 files changed, 24 insertions, 12 deletions
diff --git a/default.xml b/default.xml
index 70d8af1..ce99082 100644
--- a/default.xml
+++ b/default.xml
@@ -123,7 +123,8 @@
<project path="external/skia" name="platform/external/skia" revision="linaro_android_4.1.1" />
<!-- Linaro modifications: Need porting -->
<project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r4" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="refs/tags/android-4.1.1_r4" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
<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" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index f68115b..c41f86f 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -132,7 +132,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 482de30..f321e6d 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -129,7 +129,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index c35ea08..d68b1f3 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -116,7 +116,8 @@
<!-- Linaro modifications: Need porting -->
<project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.1.1" />
<project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.1.1_r4" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="refs/tags/android-4.1.1_r4" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" revision="refs/tags/android-4.1.1_r4" />
<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" />
diff --git a/staging-origen.xml b/staging-origen.xml
index dea20a4..f8d0318 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -131,7 +131,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 592d406..e95a959 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -132,7 +132,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index aace27f..10e139d 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -145,7 +145,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index f15870c..96c6e56 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -144,7 +144,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index d7de82f..cfff613 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -135,7 +135,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 1b03e94..e839458 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -131,7 +131,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index 66ad99c..8aa5bd8 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -129,7 +129,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index df9fc47..571d028 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -134,7 +134,8 @@
<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" />
- <project path="packages/apps/Settings" name="platform/packages/apps/Settings" />
+ <!-- Linaro modifications: Add ECM -->
+ <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.1.1" />
<project path="cts" name="platform/cts" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" />
<project path="system/media" name="platform/system/media" />