move vendor/lineage to vendor/replicant

Rationale:
- We need to brand the distribution as Replicant to make it clear that it
  is Replicant and not LineageOS.
- People are already used to vendor/replicant paths from Replicant 6.0 as
  it is used directly by users during the build procedure.

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

3 files changed, 11 insertions, 12 deletions

diff --git a/default.xml b/default.xml
index 010da40..6af43eb 100644
--- a/default.xml
+++ b/default.xml
@@ -27,10 +27,6 @@
 
   <project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" />
   <project path="build/kati" name="platform/build/kati" groups="pdk,tradefed" remote="aosp" />
-  <project path="build/soong" name="LineageOS/android_build_soong" groups="pdk,tradefed" >
-    <linkfile src="root.bp" dest="Android.bp" />
-    <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
-  </project>
   <project path="art" name="LineageOS/android_art" groups="pdk" />
   <project path="bionic" name="LineageOS/android_bionic" groups="pdk" />
   <project path="bootable/recovery" name="LineageOS/android_bootable_recovery" groups="pdk" />
@@ -381,7 +377,6 @@
   <project path="external/zlib" name="platform/external/zlib" groups="pdk" remote="aosp" />
   <project path="external/zopfli" name="platform/external/zopfli" groups="pdk" remote="aosp" />
   <project path="external/zxing" name="platform/external/zxing" groups="pdk" remote="aosp" />
-  <project path="frameworks/av" name="LineageOS/android_frameworks_av" groups="pdk" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="pdk" remote="aosp" />
   <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="pdk" remote="aosp" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="pdk" remote="aosp" />
diff --git a/replicant/repositories.xml b/replicant/repositories.xml
index cf5a1c3..b059619 100644
--- a/replicant/repositories.xml
+++ b/replicant/repositories.xml
@@ -9,17 +9,25 @@
     <linkfile src="target" dest="build/target" />
     <linkfile src="tools" dest="build/tools" />
   </project>
-
+  <project path="build/soong" name="replicant-next/build_soong" groups="pdk,tradefed" remote="replicant-next" >
+    <linkfile src="root.bp" dest="Android.bp" />
+    <linkfile src="bootstrap.bash" dest="bootstrap.bash" />
+  </project>
   <project path="device/samsung/i9300" name="replicant-next/device_samsung_i9300" remote="replicant-next" />
   <project path="device/samsung/i9305" name="replicant-next/device_samsung_i9305" remote="replicant-next" />
   <project path="device/samsung/midas-common" name="replicant-next/device_samsung_midas_common" remote="replicant-next" />
   <project path="external/libdrm" name="replicant-next/external_libdrm" groups="pdk" remote="replicant-next" />
   <project path="external/mesa3d" name="replicant-next/external_mesa3d" remote="replicant-next" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/python/mako" name="replicant-next/external_python_mako" groups="pdk" remote="replicant-next" />
+  <project path="frameworks/av" name="replicant-next/frameworks_av" groups="pdk" remote="replicant-next" />
   <project path="frameworks/base" name="replicant-next/frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="replicant-next" />
-  <project path="hardware/replicant/libsamsung-ipc" name="replicant/hardware_replicant_libsamsung-ipc" remote="replicant-next" revision="master" />
+  <project path="hardware/lineage/interfaces" name="replicant-next/hardware_lineage_interfaces" remote="replicant-next" />
+  <project path="hardware/lineage/livedisplay" name="replicant-next/hardware_lineage_livedisplay" remote="replicant-next" />
+  <project path="hardware/replicant/libsamsung-ipc" name="replicant-next/hardware_replicant_libsamsung-ipc" remote="replicant-next" revision="master" />
   <project path="hardware/samsung" name="replicant-next/hardware_samsung" remote="replicant-next" />
   <project path="kernel/replicant/linux" name="replicant-next/kernel_replicant_linux" remote="replicant-next" />
+  <project path="lineage-sdk" name="replicant-next/lineage-sdk" remote="replicant-next" />
   <project path="system/core" name="replicant-next/system_core" groups="pdk" remote="replicant-next" />
-  <project path="vendor/lineage" name="replicant-next/vendor_lineage" remote="replicant-next" />
+  <project path="vendor/qcom/opensource/power" name="replicant-next/vendor_qcom_opensource_power" remote="replicant-next" />
+  <project path="vendor/replicant" name="replicant-next/vendor_replicant" remote="replicant-next" />
 </manifest>
diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index dda37ab..436baac 100644
--- a/snippets/lineage.xml
+++ b/snippets/lineage.xml
@@ -21,10 +21,7 @@
   <project path="external/vim" name="LineageOS/android_external_vim" />
   <project path="external/zip" name="LineageOS/android_external_zip" />
   <project path="hardware/broadcom/nfc" name="LineageOS/android_hardware_broadcom_nfc" />
-  <project path="hardware/lineage/interfaces" name="LineageOS/android_hardware_lineage_interfaces" />
-  <project path="hardware/lineage/livedisplay" name="LineageOS/android_hardware_lineage_livedisplay" />
   <!--<project path="hardware/lineage/telephony" name="LineageOS/android_hardware_lineage_telephony" />-->
-  <project path="lineage-sdk" name="LineageOS/android_lineage-sdk" />
   <!--<project path="lineage-sdk/samples/weatherproviderservice/OpenWeatherMapProvider" name="LineageOS/android_packages_apps_OpenWeatherMapProvider" />-->
   <project path="packages/apps/AudioFX" name="LineageOS/android_packages_apps_AudioFX" />
   <project path="packages/apps/Backgrounds" name="LineageOS/android_packages_apps_Backgrounds" />
@@ -135,7 +132,6 @@
   <project path="vendor/qcom/opensource/dataservices" name="LineageOS/android_vendor_qcom_opensource_dataservices" groups="qcom,pdk-qcom" />
   <project path="vendor/qcom/opensource/interfaces" name="LineageOS/android_vendor_qcom_opensource_interfaces" groups="qcom,pdk-qcom" />
   <project path="vendor/qcom/opensource/libfmjni" name="LineageOS/android_vendor_qcom_opensource_libfmjni" groups="qcom,pdk-qcom" />
-  <project path="vendor/qcom/opensource/power" name="LineageOS/android_vendor_qcom_opensource_power" groups="qcom,pdk-qcom" />
   <project path="vendor/qcom/opensource/thermal-engine" name="LineageOS/android_vendor_qcom_opensource_thermal-engine" groups="qcom,pdk-qcom" />
   <project path="vendor/qcom/opensource/vibrator" name="LineageOS/android_vendor_qcom_opensource_vibrator" groups="qcom,pdk-qcom" />