From 54edac288574119dc985a89f2d78f68af228e8ae Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 27 Sep 2020 20:39:32 +0200
Subject: [PATCH] Welcome Android 11

---
 gmsexpress.xml |  6 ------
 manifest.xml   |  3 +--
 replace.xml    | 51 +++++++++++++++++++++++++++-----------------------
 3 files changed, 29 insertions(+), 31 deletions(-)
 delete mode 100644 gmsexpress.xml

diff --git a/gmsexpress.xml b/gmsexpress.xml
deleted file mode 100644
index b75fd7a..0000000
--- a/gmsexpress.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-    <remote name="gms-mirror" fetch="https://gitlab.com/gms-mirror/" />
-
-<project path="vendor/google" name="gmsexpress" revision="master" remote="gms-mirror" />
-</manifest>
diff --git a/manifest.xml b/manifest.xml
index 14074d4..98382a4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,8 +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-10.0" />
-<project path="vendor/vndk" name="vendor_vndk" remote="phh" revision="android-10.0" />
+<project path="device/phh/treble" name="device_phh_treble" remote="phh" revision="android-11.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="pie" />
diff --git a/replace.xml b/replace.xml
index 393a1ed..a982258 100644
--- a/replace.xml
+++ b/replace.xml
@@ -2,7 +2,7 @@
 <manifest>
 <remote name="phh" fetch="https://github.com/phhusson/" />
 
-<remove-project name="platform/build" />
+<!--<remove-project name="platform/build" />
 <project path="build/make" name="platform_build" remote="phh" revision="android-10.0.0_r41-phh">
     <copyfile dest="Makefile" src="core/root.mk" />
     <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk" />
@@ -12,30 +12,46 @@
     <linkfile dest="build/target" src="target" />
     <linkfile dest="build/tools" src="tools" />
 </project>
+-->
 
 <remove-project name="platform/system/core" />
-<project path="system/core" name="platform_system_core" remote="phh" revision="android-10.0.0_r41-phh" />
+<project path="system/core" name="platform_system_core" remote="phh" revision="android-11.0.0_r3-phh" />
 
-<remove-project name="platform/system/sepolicy" />
-<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-10.0.0_r41-phh" />
+<!--<remove-project name="platform/system/sepolicy" />
+<project path="system/sepolicy" name="platform_system_sepolicy" remote="phh" revision="android-11.0.0_r3-phh" />-->
 
 <remove-project name="platform/frameworks/native" />
-<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-10.0.0_r41-phh" />
+<project path="frameworks/native" name="platform_frameworks_native" remote="phh" revision="android-11.0.0_r3-phh" />
 
 <remove-project name="platform/system/vold" />
-<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-10.0.0_r41-phh" />
+<project path="system/vold" name="platform_system_vold" remote="phh" revision="android-11.0.0_r3-phh" />
 
 <remove-project name="platform/system/bt" />
-<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-10.0.0_r41-phh" />
+<project path="system/bt" name="platform_system_bt" remote="phh" revision="android-11.0.0_r3-phh" />
 
 <remove-project name="platform/external/selinux" />
-<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-10.0.0_r41-phh" />
+<project path="external/selinux" name="platform_external_selinux" remote="phh" revision="android-11.0.0_r3-phh" />
 
-<remove-project name="platform/frameworks/base" />
-<project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-10.0.0_r41-phh" />
+<remove-project name="platform/bootable/recovery" />
+<project path="bootable/recovery" name="platform_bootable_recovery" remote="phh" revision="android-11.0.0_r3-phh" />
 
 <remove-project name="platform/frameworks/av" />
-<project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-10.0.0_r41-phh" />
+<project path="frameworks/av" name="platform_frameworks_av" remote="phh" revision="android-11.0.0_r3-phh" />
+
+<remove-project name="platform/bionic" />
+<project path="bionic" name="platform_bionic" remote="phh" revision="android-11.0.0_r3-phh" />
+
+<remove-project name="platform/frameworks/base" />
+<project path="frameworks/base" name="platform_frameworks_base" remote="phh" revision="android-11.0.0_r3-phh" />
+
+<remove-project name="platform/system/linkerconfig" />
+<project path="system/linkerconfig" name="platform_linker_config" remote="phh" revision="android-11.0.0_r3-phh" />
+
+<remove-project name="platform/external/skia" />
+<project path="external/skia" name="platform_external_skia" remote="phh" revision="android-11.0.0_r3-phh" />
+
+<!--
+
 
 <remove-project name="platform/frameworks/opt/telephony" />
 <project path="frameworks/opt/telephony" name="platform_frameworks_opt_telephony" remote="phh" revision="android-10.0.0_r41-phh" />
@@ -55,22 +71,11 @@
 <remove-project name="platform/packages/services/Telephony" />
 <project path="packages/services/Telephony" name="platform_packages_services_Telephony" remote="phh" revision="android-10.0.0_r41-phh" />
 
-<remove-project name="platform/bionic" />
-<project path="bionic" name="platform_bionic" remote="phh" revision="android-10.0.0_r41-phh" />
-
-<remove-project name="platform/bootable/recovery" />
-<project path="bootable/recovery" name="platform_bootable_recovery" remote="phh" revision="android-10.0.0_r41-phh" />
-
-<remove-project name="platform/system/bpf" />
-<project path="system/bpf" name="platform_system_bpf" remote="phh" revision="android-10.0.0_r41-phh" />
-
-<remove-project name="platform/external/skia" />
-<project path="external/skia" name="platform_external_skia" remote="phh" revision="android-10.0.0_r41-phh" />
-
 <remove-project name="platform/packages/apps/DeskClock" />
 <project path="packages/apps/DeskClock" name="platform_packages_apps_DeskClock" remote="phh" revision="android-10.0.0_r41-phh" />
 
 <remove-project name="platform/packages/apps/Camera2" />
 <project path="packages/apps/Camera2" name="platform_packages_apps_Camera2" remote="phh" revision="android-10.0.0_r41-phh" />
+-->
 
 </manifest>