Add Replicant repositories

At first we tried to move LineageOS's default.xml in a
subdirectory to keep as little changes as possible with LineageOS
in that file. However git didn't properly detect that the file
was moved as some changes in the files were necessary.

As the Replicant includes are now at the end of the file, it
should minimize the non-automatic rebases.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

4 files changed, 44 insertions, 10 deletions

diff --git a/default.xml b/default.xml
index 526337a..97ae58b 100644
--- a/default.xml
+++ b/default.xml
@@ -20,15 +20,6 @@
 
   <!-- AOSP Projects -->
 
-  <project path="build/make" name="LineageOS/android_build" groups="pdk" >
-    <copyfile src="core/root.mk" dest="Makefile" />
-    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
-    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
-    <linkfile src="core" dest="build/core" />
-    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
-    <linkfile src="target" dest="build/target" />
-    <linkfile src="tools" dest="build/tools" />
-  </project>
   <project path="build/blueprint" name="platform/build/blueprint" groups="pdk,tradefed" remote="aosp" />
   <project path="build/kati" name="LineageOS/android_build_kati" groups="pdk,tradefed" />
   <project path="build/soong" name="LineageOS/android_build_soong" groups="pdk,tradefed" >
@@ -240,7 +231,6 @@
   <project path="external/lzma" name="platform/external/lzma" groups="pdk" remote="aosp" />
   <project path="external/markdown" name="platform/external/markdown" groups="pdk" remote="aosp" />
   <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" remote="aosp" />
-  <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="external/Microsoft-GSL" name="platform/external/Microsoft-GSL" groups="pdk" remote="aosp" />
   <project path="external/minijail" name="platform/external/minijail" groups="pdk" remote="aosp" />
   <project path="external/mksh" name="LineageOS/android_external_mksh" groups="pdk" />
@@ -670,4 +660,9 @@
 
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 
+  <!-- Replicant repositories -->
+  <include name="replicant/gnutoo.xml" />
+  <include name="replicant/putti.xml" />
+  <include name="replicant/samsung-ril.xml" />
+
 </manifest>
diff --git a/replicant/gnutoo.xml b/replicant/gnutoo.xml
new file mode 100644
index 0000000..a0e3e0a
--- /dev/null
+++ b/replicant/gnutoo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote  name="GNUtoo"
+           revision="GNUtoo/lineage-16.0-base"
+           fetch=".." />
+
+  <!-- To add a big hack to workaround build issues  -->
+  <project path="build/make" name="GNUtoo/android_build" groups="pdk" remote="GNUtoo">
+    <copyfile src="core/root.mk" dest="Makefile" />
+    <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" />
+    <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" />
+    <linkfile src="core" dest="build/core" />
+    <linkfile src="envsetup.sh" dest="build/envsetup.sh" />
+    <linkfile src="target" dest="build/target" />
+    <linkfile src="tools" dest="build/tools" />
+  </project>
+
+  <project path="device/samsung/i9300" name="GNUtoo/android_device_samsung_i9300" remote="GNUtoo" />
+  <project path="hardware/samsung" name="GNUtoo/android_hardware_samsung" remote="GNUtoo" />
+  <!-- Based on git://git.putti.eu/aosp/kernel_i9305.git -->
+  <project path="kernel/replicant/linux" name="GNUtoo/kernel_replicant_linux.git" remote="GNUtoo" />
+</manifest>
diff --git a/replicant/putti.xml b/replicant/putti.xml
new file mode 100644
index 0000000..196a16d
--- /dev/null
+++ b/replicant/putti.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote  name="putti"
+           revision="master"
+           fetch="git://git.putti.eu/" />
+  <project path="external/mesa3d" name="aosp/external_mesa3d.git" remote="putti" groups="pdk-cw-fs,pdk-fs" />
+</manifest>
diff --git a/replicant/samsung-ril.xml b/replicant/samsung-ril.xml
new file mode 100644
index 0000000..0f61612
--- /dev/null
+++ b/replicant/samsung-ril.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote name="replicant"
+          fetch=".."
+          revision="replicant-6.0" />
+
+  <project path="hardware/ril/samsung-ril" name="GNUtoo/hardware_ril_samsung-ril.git" remote="GNUtoo" />
+  <project path="external/libsamsung-ipc" name="GNUtoo/external_libsamsung-ipc.git" remote="GNUtoo" />
+
+</manifest>