diff options
| author | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2012-04-03 13:30:51 -0600 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2012-04-05 07:32:12 -0600 |
| commit | 98f9d8d8c91e0b8d9015410cdb536110fb466e5b (patch) | |
| tree | 1fc243a925d49e76923bdb4e325b14d0d0e9475e | |
| parent | 110363938851ffd14f05f1b3382d1aeeb5c3c04c (diff) | |
| download | manifest-98f9d8d8c91e0b8d9015410cdb536110fb466e5b.tar.gz | |
snowball: mm: Adding new branches to isolate MM
Preparing branches that share common code with other boards for
inclusion of STE MM binaries/code.
This is just to make the feature stable and allow people from
multiple location to work together and have a central repository
where they can share code.
When merging into 4.0.4 we will use conditional compilation
rather than branches to avoid conflicts with other boards.
Change-Id: Ibb6883a5203db0c77afe7a85d3e8d68cdd6baff0
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
| -rw-r--r-- | landing-snowball.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/landing-snowball.xml b/landing-snowball.xml index a0c322eba..532466560 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -25,7 +25,7 @@ <project path="hardware/st-ericsson/libsensors" name="git/android/platform/vendor/st-ericsson/hardware/libsensors" revision="igloo-dev-ics" remote="igloocommunity" /> <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_4.0.3" /> <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_4.0.3" /> - <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_4.0.3" remote="aosp" /> + <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro_android_4.0.3_snowball_mm" remote="aosp" /> <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> @@ -58,17 +58,17 @@ <project path="external/ipsec-tools" name="platform/external/ipsec-tools" revision="linaro_android_4.0.3" /> <project path="external/libvpx" name="platform/external/libvpx" revision="linaro_android_4.0.3" /> <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.0.3" /> - <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.0.3" /> + <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.0.3_snowball_mm" /> <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.0.3" /> - <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.0.3_snowball" /> - <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.3" /> + <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.0.3_snowball_mm" /> + <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.3_snowball_mm" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.3" /> <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.3" /> <project path="system/vold" name="platform/system/vold" revision="linaro_android_4.0.3"/> - <project path="bionic" name="platform/bionic" revision="linaro_android_4.0.3" /> + <project path="bionic" name="platform/bionic" revision="linaro_android_4.0.3_snowball_mm" /> <project path="external/srec" name="platform/external/srec" revision="linaro_android_4.0.3"/> <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.0.3"/> - <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.0.3"/> + <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.0.3_snowball_mm"/> <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.0.3"/> <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.0.3"/> <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.0.3"/> @@ -87,6 +87,7 @@ <project path="cts" name="platform/cts" revision="linaro_android_4.0.3" /> <project path="external/gtest" name="platform/external/gtest" revision="linaro_android_4.0.3" /> <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.0.3"/> + <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" revision="linaro_android_4.0.3_snowball_mm" /> <!-- TI proprietary-open --> <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="ics" /> @@ -206,7 +207,6 @@ <project path="external/yaffs2" name="platform/external/yaffs2" /> <project path="external/zlib" name="platform/external/zlib" /> <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" /> - <project path="frameworks/media/libvideoeditor" name="platform/frameworks/media/libvideoeditor" /> <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" /> <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" /> <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" /> |