Add infrastructure/etc_apache2 to the manifest

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

1 files changed, 25 insertions, 2 deletions

diff --git a/replicant/repositories.xml b/replicant/repositories.xml
index f6316b2..9c34d5c 100644
--- a/replicant/repositories.xml
+++ b/replicant/repositories.xml
@@ -49,8 +49,6 @@
            remote="replicant" />
   <project path="kernel/replicant/linux"
            name="replicant-next/kernel_replicant_linux" remote="replicant" />
-  <project path="manifest" name="replicant-next/manifest" remote="replicant"
-           revision="replicant-11-dev" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9"
            name="LineageOS/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9"
            groups="pdk,linux,arm" clone-depth="1" remote="replicant-mirrors"
@@ -73,6 +71,31 @@
            remote="replicant" revision="master"/>
 
   <!--
+  +==========+
+  | Manifest |
+  +==========+
+  -->
+
+  <!-- The default.xml file in the manifest repository has the least amount of
+       modifications possible. This enables easy rebasing against the upstream
+       version of that default.xml. To do that, the modifications are done in
+       separate files that are then included through include statements in the
+       default.xml.
+
+       We need to mirror all the source code we use. But our directory structure
+       in the Replicant VM is different from the one in
+       https://android.googlesource.com. So instead of heavily modifying the
+       default.xml, we handle the compatibility between both structure with
+       apache2 redirect rules. Because of that we also need to include these
+       rules in the source code releases.
+  -->
+
+  <project path="manifest" name="replicant-next/manifest" remote="replicant"
+           revision="replicant-11-dev" />
+  <project path="vendor/replicant/etc_apache2" name="infrastructure/etc_apache2"
+           remote="replicant" revision="master" />
+
+  <!--
   +=============================+
   | Port of GNU/Linux userspace |
   +=============================+