From 0c603249098cbe8ec85c5bd8f39dfeb9f149db97 Mon Sep 17 00:00:00 2001
From: Vishalcj17 <vishalcj@aospa.co>
Date: Thu, 17 Feb 2022 20:58:33 +0900
Subject: [PATCH] manifest: Update to February SPL (r31)

Change-Id: I8c28599eda7f735c57851f4a80f8eabd6fd690e1
---
 aospa.xml   | 13 +++++++++++++
 default.xml |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/aospa.xml b/aospa.xml
index 0c2da49..e874253 100644
--- a/aospa.xml
+++ b/aospa.xml
@@ -40,6 +40,10 @@
     <linkfile dest="vendor/qcom/build/tasks/kernel_definitions.mk" src="kernel_definitions.mk"/>
   </project>
 
+  <!-- External (AOSP) -->
+  <remove-project name="platform/external/libavc" />
+  <project path="external/libavc" name="platform/external/libavc" remote="aosp" />
+
   <!-- External -->
   <remove-project name="platform/external/arm-optimized-routines" />
   <project path="external/arm-optimized-routines" name="AOSPA/android_external_arm-optimized-routines" remote="aospa" />
@@ -56,11 +60,14 @@
   <project path="external/themelib" name="AOSPA/android_external_themelib" remote="aospa" />
 
   <!-- Frameworks -->
+  <remove-project name="platform/frameworks/av" />
+  <project path="frameworks/av" name="AOSPA/android_frameworks_av" remote="aospa" />
   <remove-project name="platform/frameworks/base" />
   <project path="frameworks/base" name="AOSPA/android_frameworks_base" remote="aospa" />
   <remove-project name="platform/frameworks/native" />
   <project path="frameworks/native" name="AOSPA/android_frameworks_native" remote="aospa" />
 
+
   <!-- Hardware -->
   <remove-project name="platform/hardware/interfaces" />
   <project path="hardware/interfaces" name="AOSPA/android_hardware_interfaces" remote="aospa" />
@@ -89,6 +96,12 @@
   <remove-project name="platform/packages/services/Telecomm" />
   <project path="packages/services/Telecomm" name="AOSPA/android_packages_services_Telecomm" remote="aospa" />
 
+  <!-- System (AOSP) -->
+  <remove-project name="platform/system/nfc" />
+  <project path="system/nfc" name="platform/system/nfc" remote="aosp" />
+  <remove-project name="platform/system/tools/aidl" />
+  <project path="system/tools/aidl" name="platform/system/tools/aidl" remote="aosp" />
+
   <!-- System -->
   <remove-project name="platform/system/core" />
   <project path="system/core" name="AOSPA/android_system_core" remote="aospa" />
diff --git a/default.xml b/default.xml
index 2fdd543..edd0bba 100644
--- a/default.xml
+++ b/default.xml
@@ -5,7 +5,7 @@
   <remote name="aosp"
           fetch="https://android.googlesource.com"
           review="https://android-review.googlesource.com/"
-          revision="refs/tags/android-12.0.0_r2"/>
+          revision="refs/tags/android-12.0.0_r31"/>
 
   <!-- CAF -->
   <remote name="caf_system"