manifest: Sv2 time | QSSI 7100

Change-Id: Ibe5c5ecd80156eac750b75ec1698d937a3ab740d

4 files changed, 44 insertions, 34 deletions

diff --git a/default.xml b/default.xml
index 790b162..885001f 100644
--- a/default.xml
+++ b/default.xml
@@ -13,13 +13,13 @@
 
   <remote  name="caf_system"
            fetch="https://git.codelinaro.org/clo/la"
-           revision="refs/tags/LA.QSSI.12.0.r1-06100.02-qssi.0" />
+           revision="refs/tags/LA.QSSI.12.0.r1-07100.01-qssi.0" />
 
   <remote  name="caf_vendor"
-           fetch="https://git.codelinaro.org/clo/la"
+           fetch="https://source.codeaurora.org/quic/la"
            revision="refs/tags/LA.UM.9.14.r1-18600.02-LAHAINA.QSSI12.0" />
 
-  <default revision="refs/heads/sugisawa"
+  <default revision="refs/heads/sugisawa-mr1"
            remote="ice"
            sync-c="true"
            sync-j="4" />
diff --git a/snippets/ice.xml b/snippets/ice.xml
index 1706424..98c278e 100644
--- a/snippets/ice.xml
+++ b/snippets/ice.xml
@@ -21,17 +21,20 @@
   <project path="device/qcom/common" name="Project-1CE/device_qcom_common">
     <linkfile dest="vendor/qcom/build/tasks/generate_extra_images.mk" src="generate_extra_images.mk" />
   </project>
-  <project path="device/qcom/kernelscripts" name="Project-1CE/device_qcom_kernelscripts">
+  <project revision="sugisawa" path="device/qcom/kernelscripts" name="Project-1CE/device_qcom_kernelscripts">
     <linkfile dest="vendor/qcom/build/tasks/kernel_definitions.mk" src="kernel_definitions.mk" />
   </project>
   <!-- <project path="device/qcom/sepolicy" name="Project-1CE/device_qcom_sepolicy" /> -->
-  <project path="device/qcom/sepolicy_vndr" name="Project-1CE/device_qcom_sepolicy_vndr" />
-  <project path="device/qcom/vendor-common" name="Project-1CE/device_qcom_vendor-common" />
+  <project revision="sugisawa" path="device/qcom/sepolicy_vndr" name="Project-1CE/device_qcom_sepolicy_vndr" />
+  <project revision="sugisawa" path="device/qcom/vendor-common" name="Project-1CE/device_qcom_vendor-common" />
   <project path="external/fastrpc" name="Project-1CE/external_fastrpc" />
+  <project path="external/google-fonts/cutive-mono" name="Project-1CE/external_google-fonts_cutive-mono" />
+  <project path="external/noto-fonts" name="Project-1CE/external_noto-fonts" />
+  <project path="external/roboto-fonts" name="Project-1CE/external_roboto-fonts" />
   <project path="frameworks/base" name="Project-1CE/frameworks_base" />
   <project path="frameworks/native" name="Project-1CE/frameworks_native" />
   <project path="hardware/libhardware" name="Project-1CE/hardware_libhardware" />
-  <project path="hardware/qcom/bootctrl" name="Project-1CE/hardware_qcom_bootctrl" />
+  <project revision="sugisawa" path="hardware/qcom/bootctrl" name="Project-1CE/hardware_qcom_bootctrl" />
   <!-- <project path="hardware/qcom/wlan" name="Project-1CE/hardware_qcom_wlan" /> -->
   <project path="packages/apps/DeskClock" name="Project-1CE/packages_apps_DeskClock" />
   <project path="packages/apps/Launcher3" name="Project-1CE/packages_apps_Launcher3" />
@@ -42,17 +45,18 @@
   <project path="system/core" name="Project-1CE/system_core" />
   <project path="system/sepolicy" name="Project-1CE/system_sepolicy" />
   <project path="system/update_engine" name="Project-1CE/system_update_engine" />
+  <project path="vendor/qcom/opensource/commonsys/packages/apps/Bluetooth" name="Project-1CE/vendor_qcom_opensource_commonsys_packages_apps_Bluetooth" />
   <project path="vendor/qcom/opensource/commonsys-intf/bluetooth" name="Project-1CE/vendor_qcom_opensource_commonsys-intf_bluetooth" />
   <project path="vendor/qcom/opensource/commonsys-intf/display" name="Project-1CE/vendor_qcom_opensource_commonsys-intf_display">
     <linkfile dest="vendor/qcom/defs/product-defs/system/display-product-system.mk" src="config/display-product-system.mk" />
     <linkfile dest="vendor/qcom/defs/product-defs/vendor/display-interfaces-product.mk" src="config/display-interfaces-product.mk" />
   </project>
-  <project path="vendor/qcom/opensource/commonsys-intf/wfd" name="Project-1CE/vendor_qcom_opensource_commonsys-intf_wfd" />
-  <project path="vendor/qcom/opensource/data-ipa-cfg-mgr" name="Project-1CE/vendor_qcom_opensource_data-ipa-cfg-mgr" />
+  <project revision="sugisawa" path="vendor/qcom/opensource/commonsys-intf/wfd" name="Project-1CE/vendor_qcom_opensource_commonsys-intf_wfd" />
+  <project revision="sugisawa" path="vendor/qcom/opensource/data-ipa-cfg-mgr" name="Project-1CE/vendor_qcom_opensource_data-ipa-cfg-mgr" />
   <!-- <project path="vendor/qcom/opensource/dataservices" name="Project-1CE/vendor_qcom_opensource_dataservices" /> -->
   <!-- <project path="vendor/qcom/opensource/interfaces" name="Project-1CE/vendor_qcom_opensource_interfaces" /> -->
-  <project path="vendor/qcom/opensource/power" name="Project-1CE/vendor_qcom_opensource_power" />
-  <project path="vendor/qcom/opensource/vibrator" name="Project-1CE/vendor_qcom_opensource_vibrator" />
+  <project revision="sugisawa" path="vendor/qcom/opensource/power" name="Project-1CE/vendor_qcom_opensource_power" />
+  <project revision="sugisawa" path="vendor/qcom/opensource/vibrator" name="Project-1CE/vendor_qcom_opensource_vibrator" />
 
   <!-- Add new repos -->
   <project path="packages/apps/SimpleDeviceConfig" name="Project-1CE/packages_apps_SimpleDeviceConfig" />
@@ -62,8 +66,8 @@
 
   <!-- External repos -->
   <project path="external/chromium-webview" name="LineageOS/android_external_chromium-webview" remote="github" revision="master" clone-depth="1" />
-  <project path="vendor/gapps" name="Project-1CE/vendor_gapps" remote="gitlab" revision="sugisawa" clone-depth="1" />
-  <project path="vendor/qcom/common" name="Project-1CE/proprietary_vendor_qcom_common" remote="gitlab" revision="sugisawa" />
+  <project path="vendor/gapps" name="Project-1CE/vendor_gapps" remote="gitlab" revision="sugisawa-mr1" clone-depth="1" />
+  <project path="vendor/qcom/common" name="Project-1CE/proprietary_vendor_qcom_common" remote="gitlab" revision="sugisawa-mr1" />
   <project path="vendor/qcom/sdclang" name="Project-1CE/proprietary_vendor_qcom_sdclang" remote="gitlab" revision="sugisawa" clone-depth="1" />
 
 </manifest>
diff --git a/snippets/obsolete.xml b/snippets/obsolete.xml
index 83309c4..7807aae 100644
--- a/snippets/obsolete.xml
+++ b/snippets/obsolete.xml
@@ -39,11 +39,14 @@
   <remove-project name="platform/art" />
   <remove-project name="platform/bionic" />
   <remove-project name="platform/bootable/recovery" />
-  <remove-project name="platform/build" />
+  <remove-project name="platform/build_repo" />
   <remove-project name="platform/build/soong" />
   <!-- <remove-project name="device/qcom/sepolicy" /> -->
   <remove-project name="platform/external/chromium-webview" />
   <remove-project name="platform/external/fastrpc" />
+  <remove-project name="platform/external/google-fonts/cutive-mono" />
+  <remove-project name="platform/external/noto-fonts" />
+  <remove-project name="platform/external/roboto-fonts" />
   <remove-project name="platform/frameworks/base" />
   <remove-project name="platform/frameworks/native" />
   <remove-project name="platform/hardware/libhardware" />
@@ -59,6 +62,7 @@
   <remove-project name="platform/vendor/qcom-opensource/bluetooth-commonsys-intf" />
   <remove-project name="platform/vendor/qcom-opensource/display-commonsys-intf" />
   <!-- <remove-project name="platform/vendor/qcom-opensource/interfaces" /> -->
+  <remove-project name="platform/vendor/qcom-opensource/packages/apps/Bluetooth" />
 
   <!-- Vendor -->
   <remove-project name="kernel/msm-5.4" />
diff --git a/snippets/system.xml b/snippets/system.xml
index d4b11a0..78dae20 100644
--- a/snippets/system.xml
+++ b/snippets/system.xml
@@ -35,29 +35,30 @@
   <project name="device/qcom/qssi" remote="caf_system" />
   <project name="device/qcom/qssi_32" remote="caf_system" />
   <project name="device/qcom/qssi_32go" remote="caf_system" />
+  <project name="device/qcom/qssi_lite" remote="caf_system" />
   <project name="device/qcom/sepolicy" remote="caf_system" />
   <project name="device/sample" remote="caf_system" />
   <project name="kernel/configs" remote="caf_system" />
-  <project name="kernel/prebuilts/4.19/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/5.10/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/5.10/x86-64" path="kernel/prebuilts/5.10/x86_64" remote="caf_system" />
-  <project name="kernel/prebuilts/5.4/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/5.4/x86-64" path="kernel/prebuilts/5.4/x86_64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/4.19/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/4.19/x86-64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/5.10/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/5.10/x86-64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/5.4/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/5.4/x86-64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/mainline/arm64" remote="caf_system" />
-  <project name="kernel/prebuilts/common-modules/virtual-device/mainline/x86-64" remote="caf_system" />
-  <project name="kernel/prebuilts/mainline/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/4.19/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/5.10/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/5.10/x86-64" path="kernel/prebuilts/5.10/x86_64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/5.4/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/5.4/x86-64" path="kernel/prebuilts/5.4/x86_64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/4.19/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/4.19/x86-64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/5.10/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/5.10/x86-64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/5.4/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/5.4/x86-64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/mainline/arm64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/common-modules/virtual-device/mainline/x86-64" remote="caf_system" />
+  <project clone-depth="1" name="kernel/prebuilts/mainline/arm64" remote="caf_system" />
   <project name="kernel/tests" remote="caf_system" />
   <project name="platform/art" path="art" remote="caf_system" />
   <project name="platform/bionic" path="bionic" remote="caf_system" />
   <project name="platform/bootable/libbootloader" path="bootable/libbootloader" remote="caf_system" />
   <project name="platform/bootable/recovery" path="bootable/recovery" remote="caf_system" />
-  <project name="platform/build" path="build/make" remote="caf_system">
+  <project name="platform/build_repo" path="build/make" remote="caf_system">
     <copyfile dest="Makefile" src="core/root.mk" />
     <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk" />
     <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default" />
@@ -87,10 +88,10 @@
   <project name="platform/external/ImageMagick" path="external/ImageMagick" remote="caf_system" />
   <project name="platform/external/OpenCSD" path="external/OpenCSD" remote="caf_system" />
   <project name="platform/external/Reactive-Extensions/RxCpp" path="external/Reactive-Extensions/RxCpp" remote="caf_system" />
+  <project name="platform/external/TestParameterInjector" path="external/TestParameterInjector" remote="caf_system" />
   <project name="platform/external/XNNPACK" path="external/XNNPACK" remote="caf_system" />
   <project name="platform/external/aac" path="external/aac" remote="caf_system" />
   <project name="platform/external/abseil-cpp" path="external/abseil-cpp" remote="caf_system" />
-  <project name="platform/external/adhd" path="external/adhd" remote="caf_system" />
   <project name="platform/external/adt-infra" path="external/adt-infra" remote="caf_system" />
   <project name="platform/external/android-clat" path="external/android-clat" remote="caf_system" />
   <project name="platform/external/androidplot" path="external/androidplot" remote="caf_system" />
@@ -453,6 +454,7 @@
   <project name="platform/external/rust/crates/futures-task" path="external/rust/crates/futures-task" remote="caf_system" />
   <project name="platform/external/rust/crates/futures-util" path="external/rust/crates/futures-util" remote="caf_system" />
   <project name="platform/external/rust/crates/gdbstub" path="external/rust/crates/gdbstub" remote="caf_system" />
+  <project name="platform/external/rust/crates/gdbstub_arch" path="external/rust/crates/gdbstub_arch" remote="caf_system" />
   <project name="platform/external/rust/crates/getrandom" path="external/rust/crates/getrandom" remote="caf_system" />
   <project name="platform/external/rust/crates/glob" path="external/rust/crates/glob" remote="caf_system" />
   <project name="platform/external/rust/crates/grpcio" path="external/rust/crates/grpcio" remote="caf_system" />
@@ -624,13 +626,12 @@
   <project name="platform/external/vboot_reference" path="external/vboot_reference" remote="caf_system" />
   <project name="platform/external/virglrenderer" path="external/virglrenderer" remote="caf_system" />
   <project name="platform/external/vixl" path="external/vixl" remote="caf_system" />
-  <project name="platform/external/vm_tools/p9" path="external/vm_tools/p9" remote="caf_system" />
   <project name="platform/external/vogar" path="external/vogar" remote="caf_system" />
   <project name="platform/external/volley" path="external/volley" remote="caf_system" />
   <project name="platform/external/vulkan-headers" path="external/vulkan-headers" remote="caf_system" />
   <project name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" remote="caf_system" />
   <project name="platform/external/walt" path="external/walt" remote="caf_system" />
-  <project name="platform/external/wayland" path="external/wayland" remote="caf_system" />
+  <project name="platform/external/wayland_repo" path="external/wayland" remote="caf_system" />
   <project name="platform/external/wayland-protocols" path="external/wayland-protocols" remote="caf_system" />
   <project name="platform/external/webp" path="external/webp" remote="caf_system" />
   <project name="platform/external/webrtc" path="external/webrtc" remote="caf_system" />
@@ -875,15 +876,16 @@
   <project name="platform/prebuilts/ndk" path="prebuilts/ndk" remote="caf_system" />
   <project name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" remote="caf_system" />
   <project name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" remote="caf_system" />
-  <project name="platform/prebuilts/r8" path="prebuilts/r8" remote="caf_system" />
+  <project clone-depth="1" name="platform/prebuilts/r8" path="prebuilts/r8" remote="caf_system" />
   <project name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" remote="caf_system" />
   <project name="platform/prebuilts/runtime" path="prebuilts/runtime" remote="caf_system" />
-  <project name="platform/prebuilts/rust" path="prebuilts/rust" remote="caf_system" />
+  <project clone-depth="1" name="platform/prebuilts/rust" path="prebuilts/rust" remote="caf_system" />
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" remote="caf_system" />
   <project name="platform/prebuilts/tools" path="prebuilts/tools" remote="caf_system" />
   <project name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28" remote="caf_system" />
   <project name="platform/prebuilts/vndk/v29" path="prebuilts/vndk/v29" remote="caf_system" />
   <project name="platform/prebuilts/vndk/v30" path="prebuilts/vndk/v30" remote="caf_system" />
+  <project name="platform/prebuilts/vndk/v31" path="prebuilts/vndk/v31" remote="caf_system" />
   <project name="platform/sdk" path="sdk" remote="caf_system" />
   <project name="platform/system/apex" path="system/apex" remote="caf_system" />
   <project name="platform/system/bpf" path="system/bpf" remote="caf_system" />