From 8e5fe4230f67d986454a6e2f80ad8e74aa8bb856 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 4 Oct 2022 17:29:30 -0400
Subject: [PATCH] Remove floss/gapps stuff for TrebleDroid. Android 13 wip

---
 foss.xml     | 11 ----------
 gapps.xml    |  7 -------
 manifest.xml |  2 +-
 replace.xml  | 57 +++++++++++++++++++++++++++++-----------------------
 4 files changed, 33 insertions(+), 44 deletions(-)
 delete mode 100644 foss.xml
 delete mode 100644 gapps.xml

diff --git a/foss.xml b/foss.xml
deleted file mode 100644
index 965f711..0000000
--- a/foss.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
-	<remote name="phh" fetch="https://github.com/phhusson/" />
-	<project path="packages/apps/FDroidPrivilegedExtension"
-		name="privileged-extension.git" remote="fdroid"
-		revision="refs/tags/0.2.7" />
-	<project path="vendor/foss" name="vendor_foss"
-		remote="phh" revision="master" />
-
-</manifest>
diff --git a/gapps.xml b/gapps.xml
deleted file mode 100644
index df6427d..0000000
--- a/gapps.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-	<remote name="davish" fetch="https://gitlab.com/davi.sh/" />
-	<project path="vendor/partner_gms" name="gms-android-12"
-		remote="davish" revision="d589a97c7aa34964c06077a6cc20a66234d5b16d" />
-
-</manifest>
diff --git a/manifest.xml b/manifest.xml
index 94b022d..5cce503 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,7 +3,7 @@
 <remote name="phh" fetch="https://github.com/phhusson/" />
 
 <project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="pie" />
-<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-12.0" />
+<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-13.0" />
 <project path="vendor/vndk-tests" name="vendor_vndk-tests" remote="phh" revision="master" />
 <project path="vendor/gapps-go" name="gapps-go" remote="phh" revision="master" />
 <project path="vendor/interfaces" name="vendor_interfaces" remote="phh" revision="android-11.0" />
diff --git a/replace.xml b/replace.xml
index 4910f2a..488b375 100644
--- a/replace.xml
+++ b/replace.xml
@@ -1,68 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-<remote name="phh" fetch="https://github.com/phhusson/" />
+<remote name="td" fetch="https://github.com/TrebleDroid/" />
 
 <remove-project name="platform/system/core" />
-<project path="system/core" name="platform_system_core" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/core" name="platform_system_core" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/frameworks/native" />
-<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="frameworks/native" name="platform_frameworks_native" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/vold" />
-<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/vold" name="platform_system_vold" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/bt" />
-<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/bt" name="platform_system_bt" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/external/selinux" />
-<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="external/selinux" name="platform_external_selinux" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/bootable/recovery" />
-<project path="bootable/recovery" name="platform_bootable_recovery" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="bootable/recovery" name="platform_bootable_recovery" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/frameworks/av" />
-<project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="frameworks/av" name="platform_frameworks_av" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/frameworks/base" />
-<project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="frameworks/base" name="platform_frameworks_base" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/extras" />
-<project path="system/extras" name="platform_system_extras" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/extras" name="platform_system_extras" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/frameworks/opt/telephony" />
-<project path="frameworks/opt/telephony" name="platform_frameworks_opt_telephony" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="frameworks/opt/telephony" name="platform_frameworks_opt_telephony" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/netd" />
-<project path="system/netd" name="platform_system_netd" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/netd" name="platform_system_netd" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/nfc" />
-<project path="system/nfc" name="platform_system_nfc" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/nfc" name="platform_system_nfc" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/packages/apps/Settings" />
-<project path="packages/apps/Settings" name="platform_packages_apps_Settings" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="packages/apps/Settings" name="platform_packages_apps_Settings" remote="td" revision="android-13.0.0_r8-td" />
 
-<remove-project name="platform/packages/apps/Bluetooth" />
-<project path="packages/apps/Bluetooth" name="platform_packages_apps_Bluetooth" remote="phh" revision="android-12.1.0_r11-phh" />
-
-<remove-project name="platform/packages/modules/Wifi" />
-<project path="packages/modules/Wifi" name="platform_packages_modules_Wifi" remote="phh" revision="android-12.1.0_r11-phh" />
+<remove-project name="platform/packages/modules/Bluetooth" />
+<project path="packages/modules/Bluetooth" name="platform_packages_modules_Bluetooth" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/bpf" />
-<project path="system/bpf" name="platform_system_bpf" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/bpf" name="platform_system_bpf" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/bionic" />
-<project path="bionic" name="platform_bionic" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="bionic" name="platform_bionic" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/linkerconfig" />
-<project path="system/linkerconfig" name="platform_system_linkerconfig" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/linkerconfig" name="platform_system_linkerconfig" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/frameworks/opt/net/ims" />
-<project path="frameworks/opt/net/ims" name="platform_frameworks_opt_net_ims" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="frameworks/opt/net/ims" name="platform_frameworks_opt_net_ims" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/hardware/interfaces" />
-<project path="hardware/interfaces" name="platform_hardware_interfaces" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="hardware/interfaces" name="platform_hardware_interfaces" remote="td" revision="android-13.0.0_r8-td" />
 
 <remove-project name="platform/system/security" />
-<project path="system/security" name="platform_system_security" remote="phh" revision="android-12.1.0_r11-phh" />
+<project path="system/security" name="platform_system_security" remote="td" revision="android-13.0.0_r8-td" />
+
+<remove-project name="platform/build" />
+<project path="build/make" name="platform_build" remote="td" revision="android-13.0.0_r8-td">
+    <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>
 
 </manifest>