update manifest files for master

Change-Id: I8b3ecaf7a760253fcc428e9a85662f2ecdab7827
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

11 files changed, 199 insertions, 48 deletions

diff --git a/.gitreview b/.gitreview
index e0d3490bf..8587806ca 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=android.git.linaro.org
+host=android-review.linaro.org
 port=29418
 project=platform/manifest.git
-defaultbranch=linaro_android_5.0.0
+defaultbranch=linaro-master
diff --git a/arm.xml b/arm.xml
new file mode 100644
index 000000000..85451a8db
--- /dev/null
+++ b/arm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <!-- Linaro Device Configs -->
+  <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-oreo" 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/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"/>
+
+  <!-- Linaro Kernels -->
+  <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="lsk-4.4-armlt" remote="linaro-other" groups="device,arm" />
+
+  <!-- Linaro Bootloaders -->
+  <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="device,arm" />
+
+</manifest>
diff --git a/clang.xml b/clang.xml
new file mode 100644
index 000000000..bacebc008
--- /dev/null
+++ b/clang.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote name="llvm" fetch="https://git.llvm.org/git/" />
+
+  <project path="clang-src/llvm" name="llvm.git" remote="llvm"/>
+  <project path="clang-src/llvm/tools/clang" name="clang.git" remote="llvm"/>
+  <project path="clang-src/llvm/tools/clang/tools/clang-tools-extra" name="clang-tools-extra.git" remote="llvm"/>
+  <project path="clang-src/llvm/projects/test-suite" name="test-suite" remote="llvm"/>
+  <project path="clang-src/llvm/projects/lld" name="lld" remote="llvm"/>
+  <project path="clang-src/llvm/projects/compiler-rt" name="compiler-rt" remote="llvm"/>
+  <project path="clang-src/llvm/projects/openmp" name="openmp" remote="llvm"/>
+  <project path="clang-src/llvm/projects/libcxx" name="libcxx" remote="llvm"/>
+  <project path="clang-src/llvm/projects/libcxxabi" name="libcxxabi" remote="llvm"/>
+  <project path="clang-src/llvm/projects/libunwind" name="libunwind" remote="llvm"/>
+</manifest>
diff --git a/hikey.xml b/hikey.xml
new file mode 100644
index 000000000..3e3669b57
--- /dev/null
+++ b/hikey.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <!-- Linaro Kernels -->
+  <project path="kernel/linaro/hisilicon" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.9" groups="device,hikey" />
+
+</manifest>
diff --git a/linaro-pm-extras.xml b/linaro-pm-extras.xml
new file mode 100644
index 000000000..3a61a5696
--- /dev/null
+++ b/linaro-pm-extras.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+	<project path="external/powertop" name="platform/external/powertop-2.0" revision="linaro-oreo" groups="common" remote="linaro-android"/>
+	<project path="external/powerdebug" name="platform/external/powerdebug" revision="android-master" groups="common" remote="linaro-android"/>
+	<project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" remote="linaro-android"/>
+	<project path="external/pm-qa" name="platform/external/pm-qa" revision="android" groups="common" remote="linaro-android"/>
+</manifest>
diff --git a/linaro-toolchains.xml b/linaro-toolchains.xml
index d75af3cac..7013ad44e 100644
--- a/linaro-toolchains.xml
+++ b/linaro-toolchains.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <!-- Repositories -->
-  <!-- Linaro Repositories -->
-  <remote name="linaro-android" fetch="git://android.git.linaro.org/" review="review.android.git.linaro.org" />
   <!-- Linaro Toolchains -->
-  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" remote="linaro-android" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" remote="linaro-android" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.1-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.1-linaro" remote="linaro-android" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.1-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.1-linaro" remote="linaro-android" revision="master" />
+<!--
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.4-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.4-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.4-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.4-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.1-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.1-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.1-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.1-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.3-linaro" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-6.3-linaro" remote="linaro-android" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.3-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-6.3-linaro" remote="linaro-android" revision="master" />
+-->
 </manifest>
diff --git a/linaro.xml b/linaro.xml
index e7713a7db..2468b4414 100644
--- a/linaro.xml
+++ b/linaro.xml
@@ -2,43 +2,21 @@
 <manifest>
   <!-- Repositories -->
   <!-- Linaro Repositories -->
-  <remote name="linaro-android" fetch="git://android.git.linaro.org/" review="review.android.git.linaro.org" />
-  <remote name="linaro-other" fetch="git://git.linaro.org/" />
-  <remote name="git-ti-mirror" fetch="git://git.ti.com/" />
-  <remote name="github" fetch="http://github.com/96boards" />
+  <remote name="linaro-android" fetch="http://android-git.linaro.org/git/" review="android-review.linaro.org" />
+  <remote name="linaro-other" fetch="http://git.linaro.org/" />
 
-<!-- Linaro AddOn Projects -->
+  <!-- Linaro AddOn Projects -->
+  <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-1.21-master-20140515" remote="linaro-android"/>
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro-android" 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="android-master" remote="linaro-android"/>
-<!--
-<project path="external/powertop" name="platform/external/powertop-2.0" revision="android" groups="common" remote="linaro-android"/>
--->
-<project path="external/powerdebug" name="platform/external/powerdebug" revision="android-master" groups="common" remote="linaro-android"/>
-  <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" remote="linaro-android"/>
-  <project path="external/pm-qa" name="platform/external/pm-qa" revision="android" groups="common" remote="linaro-android"/>
-  <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-juice-master-20140514" remote="linaro-android"/>
-  <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="for-aosp-master-after-20150818" remote="linaro-android"/>
+  <project path="external/piglit" name="platform/external/piglit" revision="linaro-nougat" remote="linaro-android"/>
+  <project path="external/linaro-android-kernel-test" name="platform/external/linaro-android-kernel-test" revision="linaro-oreo" remote="linaro-android"/>
+  <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="linaro-nougat" 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="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-lollipop" remote="linaro-android" groups="device,arm" />
-  <project path="device/linaro/juno32" name="device/linaro/juno32" revision="linaro-lollipop" remote="linaro-android" groups="device,arm" />
-  <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="android-master"/>
-  <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-lollipop" remote="linaro-android" groups="device,arm" />
-  <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-fvp-lollipop" remote="linaro-android" groups="device,arm" />
-
-  <!-- Linaro Kernels -->
-  <project path="kernel/linaro/armlt" name="landing-teams/working/arm/kernel-release" revision="lsk-3.10-armlt-juno" remote="linaro-other" groups="device,arm" />
-  <project path="kernel/linaro/hisilicon" name="kernel/hikey-linaro" revision="android-hikey-linaro-4.4" remote="aosp" />
-
-  <!-- Linaro Bootloaders -->
-  <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="non-default,juno,juno32" />
-
-  <!--For Hikey Board -->
-  <project path="packages/apps/UsbSpeedSwitch" name="android_packages_apps_UsbSpeedSwitch" revision="master" remote="github" groups="device,hikey" />
-
+  <!--Linaro common device configuration repository used by all platforms  -->
+  <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-oreo"/>
 </manifest>
diff --git a/optee.xml b/optee.xml
new file mode 100644
index 000000000..a969ddf41
--- /dev/null
+++ b/optee.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote name="github-optee" fetch="https://github.com/" />
+
+  <project path="external/optee_test" name="OP-TEE/optee_test" revision="master" remote="github-optee" />
+  <project path="external/optee_client" name="OP-TEE/optee_client" revision="master" remote="github-optee" />
+  <project path="optee/optee_os" name="OP-TEE/optee_os" revision="master" remote="github-optee" />
+  <project path="external/optee_hello_world" name="linaro-swg/hello_world" revision="master" remote="github-optee" />
+
+</manifest>
diff --git a/update-externals.xml b/update-externals.xml
index 9c5501528..f1dcdf175 100644
--- a/update-externals.xml
+++ b/update-externals.xml
@@ -1,16 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <!-- Repositories -->
-  <!-- Linaro Repositories -->
-  <remote name="linaro-android" fetch="git://android.git.linaro.org/" review="review.android.git.linaro.org" />
   <!-- Projects with newer upstream versions -->
-  <!-- SQLite -->
+  <!-- sqlite -->
+<!--
   <remove-project name="platform/external/sqlite" />
-  <project path="external/sqlite" name="platform/external/sqlite" remote="linaro-android" revision="linaro-upstream-3.8.10.1" />
+  <project path="external/sqlite" name="platform/external/sqlite" remote="linaro-android" revision="linaro-upstream-3.16.2" />
+-->
   <!-- giflib -->
+<!--
   <remove-project name="platform/external/giflib" />
-  <project path="external/giflib" name="platform/external/giflib" remote="linaro-android" revision="linaro-upstream-5.1.1" />
+  <project path="external/giflib" name="platform/external/giflib" remote="linaro-android" revision="linaro-upstream-5.1.4" />
+-->
+
+  <!-- fio -->
+<!--
+  <remove-project name="platform/external/fio" />
+  <project path="external/fio" name="platform/external/fio" remote="linaro-android" revision="linaro-upstream-2.8" />
+-->
+
+  <!-- tremolo -->
+<!-- which will cause boot up error like this:
+F libc    : CANNOT LINK EXECUTABLE "/system/bin/app_process32": "/system/lib/libvorbisidec.so" has text relocations (https://android.googlesource.com/platform/bionic/+/master/android-changes-for-ndk-developers.md#Text-Relocations-Enforced-for-API-level-23)
+  <remove-project name="platform/external/tremolo" />
+  <project path="external/tremolo" name="platform/external/tremolo" remote="linaro-android" revision="linaro-upstream-0.08" />
+-->
+
+  <!-- libevent -->
+<!-- which will cause tombstoned service restarted indefinitely
+  <remove-project name="platform/external/libevent" />
+  <project path="external/libevent" name="platform/external/libevent" remote="linaro-android" revision="linaro-upstream-2.1.8-stable" />
+-->
+
+  <!-- harfbuzz-ng -->
+  <remove-project name="platform/external/harfbuzz_ng" />
+  <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" remote="linaro-android" revision="linaro-upstream-1.4.6" />
+
+  <!-- libusb -->
+  <remove-project name="platform/external/libusb" />
+  <project path="external/libusb" name="platform/external/libusb" remote="linaro-android" revision="linaro-upstream-1.0.21" />
+
+  <!-- pcre -->
+  <remove-project name="platform/external/pcre" />
+  <project path="external/pcre" name="platform/external/pcre" remote="linaro-android" revision="linaro-upstream-10.23" />
+
+  <!-- freetype -->
+  <remove-project name="platform/external/freetype" />
+  <project path="external/freetype" name="platform/external/freetype" remote="linaro-android" revision="linaro-upstream-2.8" />
+
+  <!-- libopus -->
+  <remove-project name="platform/external/libopus" />
+  <project path="external/libopus" name="platform/external/libopus" remote="linaro-android" revision="linaro-upstream-1.1.5" />
+
+  <!-- elfutils -->
+  <remove-project name="platform/external/elfutils" />
+  <project path="external/elfutils" name="platform/external/elfutils" remote="linaro-android" revision="linaro-upstream-0.169" />
+
+  <!-- ImageMagick -->
+  <remove-project name="platform/external/ImageMagick" />
+  <project path="external/ImageMagick" name="platform/external/ImageMagick" remote="linaro-android" revision="linaro-upstream-7.0.6-0" />
+
+  <!-- iproute2 -->
+  <remove-project name="platform/external/iproute2" />
+  <project path="external/iproute2" name="platform/external/iproute2" remote="linaro-android" revision="linaro-upstream-4.11.0" />
+
+  <!-- iputils -->
+  <remove-project name="platform/external/iputils" />
+  <project path="external/iputils" name="platform/external/iputils" remote="linaro-android" revision="linaro-upstream-20151218" />
+
+  <!-- jemalloc -->
+  <remove-project name="platform/external/jemalloc" />
+  <project path="external/jemalloc" name="platform/external/jemalloc" remote="linaro-android" revision="linaro-upstream-4.5.0" />
+
+  <!-- libcap-ng -->
+  <remove-project name="platform/external/libcap-ng" />
+  <project path="external/libcap-ng" name="platform/external/libcap-ng" remote="linaro-android" revision="linaro-upstream-0.7.8" />
+
+  <!-- libogg -->
+  <remove-project name="platform/external/libogg" />
+  <project path="external/libogg" name="platform/external/libogg" remote="linaro-android" revision="linaro-upstream-1.3.2" />
+
+  <!-- libxml2 -->
+  <remove-project name="platform/external/libxml2" />
+  <project path="external/libxml2" name="platform/external/libxml2" remote="linaro-android" revision="linaro-upstream-2.9.4" />
+
   <!-- libpng -->
   <remove-project name="platform/external/libpng" />
-  <project path="external/libpng" name="platform/external/libpng" remote="linaro-android" revision="linaro-upstream-1.6.17" />
+  <project path="external/libpng" name="platform/external/libpng" remote="linaro-android" revision="linaro-upstream-1.6.29" />
+
+  <!-- e2fsprogs -->
+  <remove-project name="platform/external/e2fsprogs" />
+  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" remote="linaro-android" revision="linaro-upstream-1.43.4" />
+
 </manifest>
diff --git a/x15.xml b/x15.xml
new file mode 100644
index 000000000..3f9cbf5bb
--- /dev/null
+++ b/x15.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <!-- TI repositories -->
+  <remote name="git-ti-mirror" fetch="git://git.ti.com/" />
+
+  <project path="device/ti/proprietary-open" name="device/ti/proprietary-open-jacinto" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
+  <project path="device/ti/am57xevm" name="device/ti/am57xevm" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
+  <!--mirror of http://git.ti.com/android-sdk/device-ti-jacinto6evm  -->
+  <project path="device/ti/jacinto6evm" name="device/ti/jacinto6evm.git/" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
+  <project path="hardware/ti/dra7xx" name="hardware/ti/dra7xx" revision="d-nougat-release" remote="linaro-android" groups="device,ti" />
+  <project path="hardware/ti/ipc" name="hardware/ti/ipc" revision="refs/tags/3.43.00.01" remote="linaro-android" groups="device,ti" />
+  <project path="hardware/ti/linuxutils" name="hardware/ti/linuxutils" revision="refs/tags/4.11.00.01" remote="linaro-android" groups="device,ti" />
+  <project path="hardware/ti/dce" name="hardware/ti/dce" revision="refs/tags/3.00.11.00" remote="linaro-android" groups="device,ti" />
+
+  <!-- mirror of http://git.ti.com/android-sdk/u-boot/ -->
+  <project path="ti/u-boot" name="u-boot/linaro/jacinto6evm.git" revision="p-ti-u-boot-2016.05" remote="linaro-android" groups="device,ti" />
+  <!--
+  Changed to use mirror from android-git.linaro.org instead of
+  https://git.ti.com/android-sdk/kernel-omap/commits/p-ti-lsk-android-linux-4.4.y
+  -->
+  <project path="kernel/ti/x15" name="kernel/omap-omapzoom.git" revision="p-ti-lsk-android-linux-4.4.y" remote="linaro-android" groups="device,ti" />
+
+</manifest>
diff --git a/x20.xml b/x20.xml
new file mode 100644
index 000000000..0526d27fe
--- /dev/null
+++ b/x20.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+	<!-- remote name="github-x20" fetch="https://github.com/helio-x20" / -->
+	<remote name="github-x20" fetch="https://github.com/berolinaro" />
+
+	<project path="device/mediatek/common" name="device/mediatek/common" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<project path="device/mediatek/mt6797" name="device/mediatek/mt6797" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<project path="device/amt/amt6797_64_open" name="device/amt/amt6797_64_open" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<project path="vendor/mediatek" name="vendor/mediatek" remote="linaro-android" revision="master" groups="device,mtk" />
+	<project path="vendor/amt" name="vendor/amt" remote="linaro-android" revision="master" groups="device,mtk" />
+	<project path="prebuilts/gcc/linux-x86/arm/gcc-arm-none-eabi-4_8-2014q3" name="prebuilts/gcc/linux-x86/arm/gcc-arm-none-eabi-4_8-2014q3" remote="linaro-android" revision="master" groups="device,mtk"/>
+	<!-- project path="kernel/amt/amt6797_64_open" name="linux" remote="github-x20" revision="helio-x20" groups="device,mtk" / -->
+	<project path="kernel/amt/amt6797_64_open" name="linux-1" remote="github-x20" revision="helio-x20" groups="device,mtk" />
+
+</manifest>