update-externals.xml & x15.xml: update entries

comment out all external projects to use aosp master external
projects.

update x15.xml to use projects from ti instead mirror from
linaro-android

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

2 files changed, 51 insertions, 22 deletions

diff --git a/update-externals.xml b/update-externals.xml
index f1dcdf175..c7537af70 100644
--- a/update-externals.xml
+++ b/update-externals.xml
@@ -32,63 +32,85 @@ F libc    : CANNOT LINK EXECUTABLE "/system/bin/app_process32": "/system/lib/lib
 -->
 
   <!-- 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.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
index 3f9cbf5bb..4e9d250bf 100644
--- a/x15.xml
+++ b/x15.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <!-- TI repositories -->
-  <remote name="git-ti-mirror" fetch="git://git.ti.com/" />
+  <remote name="omap-mirror"
+          fetch="git://git.omapzoom.org"
+          review="http://review.omapzoom.org" />
 
-  <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" />
+  <remote name="git-ti-com"
+          fetch="git://git.ti.com" />
 
-  <!-- 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" />
+  <!-- TI addons -->
+  <project path="device/ti/proprietary-open" name="android/device-ti-proprietary-open" remote="git-ti-com" revision="d-oreo-r6-release" groups="device,ti" />
+  <project path="device/ti/jacinto6evm" name="android/device-ti-jacinto6evm" remote="git-ti-com" revision="d-oreo-r6-release" groups="device,ti" />
+  <project path="device/ti/am57xevm" name="android/device-ti-am57xevm" remote="git-ti-com" revision="d-oreo-r6-release" groups="device,ti" />
+
+  <!-- TI Connectivity -->
+  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" remote="omap-mirror" revision="d-oreo-r6-release" groups="device,ti" />
+
+  <!-- TI MM -->
+  <project path="hardware/ti/dra7xx" name="platform/hardware/ti/dra7xx" remote="omap-mirror" revision="d-oreo-r6-release" groups="device,ti" />
+  <project path="hardware/ti/ipc" name="ipc/ipcdev" remote="git-ti-com" revision="refs/tags/3.47.00.00" groups="device,ti" />
+  <project path="hardware/ti/linuxutils" name="ipc/ludev" remote="git-ti-com" revision="lu-next" groups="device,ti" />
+  <project path="hardware/ti/dce" name="repo/libdce" remote="omap-mirror" revision="refs/tags/3.00.14.00" groups="device,ti" />
+
+  <!-- http://git.ti.com/cgit/cgit.cgi/android/u-boot.git/log/?h=p-ti-u-boot-2016.05 -->
+  <project path="ti/u-boot" name="android/u-boot.git" revision="p-ti-u-boot-2016.05" remote="git-ti-com" groups="device,ti" />
+  <!-- http://git.ti.com/cgit/cgit.cgi/android/kernel.git/log/?h=p-ti-android-linux-4.4.y -->
+  <project path="kernel/ti/x15" name="android/kernel.git" revision="p-ti-android-linux-4.4.y" remote="git-ti-com" groups="device,ti" />
 
 </manifest>