diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-08-09 13:29:34 -0600 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-08-09 13:29:34 -0600 |
| commit | 79b5bce0133eb818b93696709423c03efbc07c57 (patch) | |
| tree | 602f1d341ff53c15a1a42cc7bf24a577d3025fd9 | |
| parent | 899e2cb69555f184e83d0625c9a727172300468f (diff) | |
| parent | 11188bb06c071041f128fe446e477987f5b1c3dc (diff) | |
| download | manifest-79b5bce0133eb818b93696709423c03efbc07c57.tar.gz | |
Merge branch 'linaro_android_2.3.4' of ssh://git.linaro.org/srv/git.linaro.org/git/android/platform/manifest into linaro-linaro_android_2.3.4
| -rw-r--r-- | LEB-iMX53.xml | 16 | ||||
| -rw-r--r-- | LEB-panda.xml | 2 | ||||
| -rw-r--r-- | LEB-snowball.xml | 4 | ||||
| -rw-r--r-- | default.xml | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/LEB-iMX53.xml b/LEB-iMX53.xml index f4c3c2bb6..71108e06e 100644 --- a/LEB-iMX53.xml +++ b/LEB-iMX53.xml @@ -8,7 +8,7 @@ <remote name="linaro-android" fetch="git://git.linaro.org/android/" - review="android.git.linaro.org" /> + review="review.android.git.linaro.org" /> <remote name="linaro-other" fetch="git://git.linaro.org/" /> @@ -43,8 +43,13 @@ <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.4" remote="linaro-android" /> + <project path="external/busybox" name="people/botaosun/busybox" revision="linaro_android_2.3.4" remote="linaro-other" /> - + <!-- Power WG --> + <project name="tools/powertop" path="external/powertop" remote="linaro-other" revision="71e15db3e0714dfdb9949c24cf676a65bb6c54f0"/> + <project name="people/amitdanielk/library/ncurses" path="external/ncurses" remote="linaro-other" revision="5fc466743430377a29b0dc6a38b0d1de843581e7"/> + <project name="people/amitdanielk/library/libnl" path="external/libnl" remote="linaro-other" revision="bbcb553f0f4636dd40e84d320a576b3de7b95357"/> + <project path="build" name="platform/build" revision="linaro_android_2.3.4" remote="linaro-android" > <copyfile src="core/root.mk" dest="Makefile" /> </project> @@ -91,7 +96,6 @@ <project path="external/dropbear" name="platform/external/dropbear" /> <project path="external/e2fsprogs" name="platform/external/e2fsprogs" /> <project path="external/easymock" name="platform/external/easymock" /> - <!-- project path="external/elfcopy" name="platform/external/elfcopy" / --> <project path="external/elfutils" name="platform/external/elfutils" /> <project path="external/embunit" name="platform/external/embunit" /> <project path="external/emma" name="platform/external/emma" /> @@ -119,7 +123,11 @@ <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" /> <project path="external/libpcap" name="platform/external/libpcap" /> <project path="external/libpng" name="platform/external/libpng" /> - <project path="external/libvpx" name="platform/external/libvpx" /> + <!-- Multimedia extensions --> + <project path="external/libvpx" name="people/bernhardrosenkranzer/libvpx" revision="android" remote="linaro-other" /> + <!-- project path="external/x264" name="people/bernhardrosenkranzer/x264" revision="android" remote="linaro-other" / --> + <!-- project path="external/ffmpeg" name="people/bernhardrosenkranzer/ffmpeg" revision="android-0.8" remote="linaro-other" / --> + <!-- Back to same old boring stuff ;) --> <project path="external/libxml2" name="platform/external/libxml2" /> <project path="external/mtpd" name="platform/external/mtpd" /> <project path="external/netcat" name="platform/external/netcat" /> diff --git a/LEB-panda.xml b/LEB-panda.xml index 64bb65349..57d8e1b35 100644 --- a/LEB-panda.xml +++ b/LEB-panda.xml @@ -8,7 +8,7 @@ <remote name="linaro-android" fetch="git://git.linaro.org/android/" - review="android.git.linaro.org" /> + review="review.android.git.linaro.org" /> <remote name="linaro-other" fetch="git://git.linaro.org/" /> diff --git a/LEB-snowball.xml b/LEB-snowball.xml index 3f77f8184..d0722b20d 100644 --- a/LEB-snowball.xml +++ b/LEB-snowball.xml @@ -8,7 +8,7 @@ <remote name="linaro-android" fetch="git://git.linaro.org/android/" - review="android.git.linaro.org" /> + review="review.android.git.linaro.org" /> <remote name="linaro-other" fetch="git://git.linaro.org/" /> @@ -29,7 +29,7 @@ <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.4" remote="linaro-android" /> - <project path="device/linaro/snowball" name="people/mpoirier/snowball/leb-snowball" revision="linaro_android_2.3.4" remote="linaro-other" /> + <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.4" remote="linaro-android" /> <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.4" remote="linaro-android" /> diff --git a/default.xml b/default.xml index f5a52a22a..378ece81d 100644 --- a/default.xml +++ b/default.xml @@ -8,7 +8,7 @@ <remote name="linaro-android" fetch="git://git.linaro.org/android/" - review="android.git.linaro.org" /> + review="review.android.git.linaro.org" /> <remote name="linaro-other" fetch="git://git.linaro.org/" /> |