Include frameworks/native

foss.xml

@@ -7,5 +7,4 @@
 		revision="refs/tags/0.2.7" />
 	<project path="vendor/foss" name="vendor_foss"
 		remote="phh" revision="master" />
-
 </manifest>

gapps.xml

@@ -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>

manifest.xml

@@ -1,19 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 <remote name="phh" fetch="https://github.com/phhusson/" />
-<remote name="damillora" fetch="https://git.nanao.moe/android/" />
+<!--
+     (device boot) means those contain device-specific fixes which are required to boot
+     (boot) means it is required to boot
+-->
 
-<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="pie" />
+<!-- (device boot) Needed only for Essential PH-1 Oreo Beta 1 -->
-<project path="device/phh/treble" name="device_phh_treble" remote="damillora" revision="android-12.0" />
+<remove-project name="platform/frameworks/av" />
-<project path="vendor/vndk-tests" name="vendor_vndk-tests" remote="phh" revision="master" />
+<project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-vts-8.0_r4-phh" />
-<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" />
-<project path="vendor/lptools" name="vendor_lptools" remote="phh" revision="master" />
 
+<!-- Needed to display FBE sdcard in MTP -->
+<remove-project name="platform/frameworks/base" />
+<project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-vts-8.0_r4-phh" />
 
-<project path="vendor/magisk" name="vendor_magisk" remote="phh" revision="android-10.0" />
+<!-- Needed for Huawei HWC -->
+<remove-project name="platform/frameworks/native" />
+<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-vts-8.0_r4-phh" />
 
-<!-- exfat support -->
+<!-- (device boot) To debug. Most probably SEPolicy one liner, huawei -->
-<remote name="relan" fetch="https://github.com/relan/" />
+<remove-project name="platform/frameworks/opt/net/wifi" />
-<project path="external/exfat" name="exfat" remote="relan" revision="master" />
+<project path="frameworks/opt/net/wifi" name="platform_frameworks_opt_net_wifi" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<!-- (boot) Needed to disable dm-verity and adb auth on A/B devices, required for booting -->
+<remove-project name="platform/system/core" />
+<project path="system/core" name="platform_system_core" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<!-- (device boot) Needed for FBE on f2fs and sdcard. All upstreamed in 8.1 -->
+<remove-project name="platform/system/vold" />
+<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<!-- Required for tethering on Huawei -->
+<remove-project name="platform/system/netd" />
+<project path="system/netd" name="platform_system_netd" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<!-- Needed for multi-sim settings -->
+<remove-project name="platform/packages/services/Telephony" />
+<project path="packages/services/Telephony" name="platform_packages_services_Telephony" remote="phh" revision="android-vts-8.0_r4-phh" />
+
+<project path="vendor/hardware_overlay" name="vendor_hardware_overlay" remote="phh" revision="master" />
+<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-8.0" />
 </manifest>

opengapps.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+<remote name="opengapps" fetch="https://github.com/opengapps/"  />
+
+<project path="vendor/opengapps/build" name="aosp_build" revision="master" remote="opengapps" />
+<project path="vendor/opengapps/sources/all" name="all" clone-depth="1" revision="master" remote="opengapps" />
+
+<!-- arm64 depends on arm -->
+<project path="vendor/opengapps/sources/arm" name="arm" clone-depth="1" revision="master" remote="opengapps" />
+<project path="vendor/opengapps/sources/arm64" name="arm64" clone-depth="1" revision="master" remote="opengapps" />
+
+<project path="vendor/opengapps/sources/x86" name="x86" clone-depth="1" revision="master" remote="opengapps" />
+<project path="vendor/opengapps/sources/x86_64" name="x86_64" clone-depth="1" revision="master" remote="opengapps" />
+</manifest>