diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 59b7e0c..9d735ce 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -132,10 +132,11 @@ tasks.register("generateBp") {
     val isAvailableInAosp = { group: String, artifactId: String ->
         when {
             group.startsWith("androidx") -> {
-                // We provide our own androidx.{media3,navigation} & lifecycle-common
+                // We provide our own androidx.{media3,navigation,savedstate} & lifecycle-common
                 !group.startsWith("androidx.media3") &&
                         !group.startsWith("androidx.multidex") &&
                         !group.startsWith("androidx.navigation") &&
+                        !group.startsWith("androidx.savedstate") &&
                         artifactId != "lifecycle-common"
             }
 
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 19568a2..cc579b5 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -380,7 +380,7 @@ android_library_import {
         "androidx.lifecycle_lifecycle-viewmodel-ktx",
         "androidx.lifecycle_lifecycle-viewmodel-savedstate",
         "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate-ktx",
+        "Glimpse_androidx.savedstate_savedstate-ktx",
         "kotlin-stdlib",
     ],
 }
@@ -403,7 +403,7 @@ android_library {
         "androidx.lifecycle_lifecycle-viewmodel-ktx",
         "androidx.lifecycle_lifecycle-viewmodel-savedstate",
         "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate-ktx",
+        "Glimpse_androidx.savedstate_savedstate-ktx",
         "kotlin-stdlib",
     ],
     java_version: "1.7",
@@ -623,6 +623,72 @@ android_library {
     java_version: "1.7",
 }
 
+android_library_import {
+    name: "Glimpse_androidx.savedstate_savedstate-ktx-nodeps",
+    aars: ["androidx/savedstate/savedstate-ktx/1.2.1/savedstate-ktx-1.2.1.aar"],
+    sdk_version: "33",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "Glimpse_androidx.savedstate_savedstate",
+        "kotlin-stdlib",
+    ],
+}
+
+android_library {
+    name: "Glimpse_androidx.savedstate_savedstate-ktx",
+    sdk_version: "33",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "androidx/savedstate/savedstate-ktx/1.2.1/AndroidManifest.xml",
+    static_libs: [
+        "Glimpse_androidx.savedstate_savedstate-ktx-nodeps",
+        "Glimpse_androidx.savedstate_savedstate",
+        "kotlin-stdlib",
+    ],
+    java_version: "1.7",
+}
+
+android_library_import {
+    name: "Glimpse_androidx.savedstate_savedstate-nodeps",
+    aars: ["androidx/savedstate/savedstate/1.2.1/savedstate-1.2.1.aar"],
+    sdk_version: "33",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "androidx.arch.core_core-common",
+        "Glimpse_androidx.lifecycle_lifecycle-common",
+        "kotlin-stdlib",
+    ],
+}
+
+android_library {
+    name: "Glimpse_androidx.savedstate_savedstate",
+    sdk_version: "33",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "androidx/savedstate/savedstate/1.2.1/AndroidManifest.xml",
+    static_libs: [
+        "Glimpse_androidx.savedstate_savedstate-nodeps",
+        "androidx.arch.core_core-common",
+        "Glimpse_androidx.lifecycle_lifecycle-common",
+        "kotlin-stdlib",
+    ],
+    java_version: "1.7",
+}
+
 java_import {
     name: "Glimpse_com.github.bumptech.glide_annotations-nodeps",
     jars: ["com/github/bumptech/glide/annotations/4.15.1/annotations-4.15.1.jar"],
diff --git a/app/libs/androidx/savedstate/savedstate-ktx/1.2.1/AndroidManifest.xml b/app/libs/androidx/savedstate/savedstate-ktx/1.2.1/AndroidManifest.xml
new file mode 100644
index 0000000..18ca539
--- /dev/null
+++ b/app/libs/androidx/savedstate/savedstate-ktx/1.2.1/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.savedstate.ktx" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/savedstate/savedstate-ktx/1.2.1/savedstate-ktx-1.2.1.aar b/app/libs/androidx/savedstate/savedstate-ktx/1.2.1/savedstate-ktx-1.2.1.aar
new file mode 100644
index 0000000..e984fef
Binary files /dev/null and b/app/libs/androidx/savedstate/savedstate-ktx/1.2.1/savedstate-ktx-1.2.1.aar differ
diff --git a/app/libs/androidx/savedstate/savedstate/1.2.1/AndroidManifest.xml b/app/libs/androidx/savedstate/savedstate/1.2.1/AndroidManifest.xml
new file mode 100644
index 0000000..d9ff51d
--- /dev/null
+++ b/app/libs/androidx/savedstate/savedstate/1.2.1/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.savedstate" >
+
+    <uses-sdk android:minSdkVersion="14" />
+
+</manifest>
\ No newline at end of file
diff --git a/app/libs/androidx/savedstate/savedstate/1.2.1/savedstate-1.2.1.aar b/app/libs/androidx/savedstate/savedstate/1.2.1/savedstate-1.2.1.aar
new file mode 100644
index 0000000..51b4970
Binary files /dev/null and b/app/libs/androidx/savedstate/savedstate/1.2.1/savedstate-1.2.1.aar differ