summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2016-08-25 10:30:51 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2016-08-25 05:38:20 +0000
commit5980916b7eb090b5034b9a3d0a21ad96da8d982e (patch)
treec42d571819e524a3d706b66776de52a2433a84c8
parentd8a64b22e7355ffa9bdc0d84671aa340acb8abbe (diff)
downloadmanifest-5980916b7eb090b5034b9a3d0a21ad96da8d982e.tar.gz
update manifest to Android N
Change-Id: I23e6421465b6617c9dcf9f6a39b4802a45a0f594 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r--linaro.xml27
1 files changed, 15 insertions, 12 deletions
diff --git a/linaro.xml b/linaro.xml
index c5058784c..289c43010 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -12,30 +12,33 @@
<project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" groups="device,arm"/>
<!-- Linaro Tests -->
<project path="external/busybox" name="platform/external/busybox" revision="linaro-marshmallow" remote="linaro-android"/>
- <project path="android-patchsets" name="android-patchsets" revision="master" remote="linaro-android"/>
<project path="external/waffle" name="platform/external/waffle" revision="linaro-armv8" remote="linaro-android"/>
- <project path="external/piglit" name="platform/external/piglit" revision="linaro-marshmallow" remote="linaro-android"/>
+ <!-- project path="external/piglit" name="platform/external/piglit" revision="linaro-marshmallow" remote="linaro-android"/ -->
<project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-marshmallow" remote="linaro-android"/>
- <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="linaro-marshmallow" remote="linaro-android"/>
+ <!-- project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="linaro-marshmallow" remote="linaro-android"/ -->
<project path="external/libc-bench" name="platform/external/libc-bench" revision="master" remote="linaro-android"/>
- <project path="external/stringbench" name="platform/external/stringbench" revision="master" remote="linaro-android"/>
+ <!-- project path="external/stringbench" name="platform/external/stringbench" revision="master" remote="linaro-android"/ -->
+ <project path="android-patchsets" name="android-patchsets" revision="master" remote="linaro-android"/>
<!-- Linaro Device Configs -->
- <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm" />
- <project path="device/linaro/juno_prebuilt_kernel" name="android/device/linaro/juno_prebuilt_kernel" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm" />
- <project path="device/linaro/juno32" name="device/linaro/juno32" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm" />
- <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-marshmallow"/>
- <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-marshmallow" remote="linaro-android" groups="device,lsk,arm" />
- <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-marshmallow" remote="linaro-android" groups="device,lsk,arm" />
+ <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-nougat" remote="linaro-android" groups="device,arm"/>
+ <project path="device/linaro/juno_prebuilt_kernel" name="android/device/linaro/juno_prebuilt_kernel" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm"/>
+ <!-- project path="device/linaro/juno32" name="device/linaro/juno32" revision="linaro-marshmallow" remote="linaro-android" groups="device,arm"/ -->
+ <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-nougat"/>
+ <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-nougat" remote="linaro-android" groups="device,lsk,arm"/>
+ <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-nougat" remote="linaro-android" groups="device,lsk,arm"/>
+ <!-- Let's pull in more current versions of hikey device configs -->
+ <remove-project name="device/linaro/hikey"/>
+ <remove-project name="device/linaro/hikey-kernel"/>
<project path="device/linaro/hikey" name="device/linaro/hikey" revision="master" remote="aosp" groups="device,hikey" />
<project path="device/linaro/hikey-kernel" name="device/linaro/hikey-kernel" revision="master" remote="aosp" groups="device,hikey" />
<!-- Linaro Kernels -->
- <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="lsk-3.18-armlt" remote="linaro-other" groups="arm" />
+ <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="lsk-3.18-armlt" remote="linaro-other" groups="device,arm" />
<project path="kernel/linaro/hisilicon" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.4" remote="aosp" groups="device,hikey" />
<!-- Linaro Bootloaders -->
- <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="device,vexpress-lsk,arm" />
+ <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="device,arm" />
<project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="device,arm" />
</manifest>