diff --git a/Android.bp b/Android.bp
index 33f409d..5f5359b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,13 +32,10 @@
     product_specific: true,
 
     static_libs: [
-        "androidx.core_core",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.customview_customview",
-        "androidx.fragment_fragment",
+        // DO NOT EDIT THIS SECTION MANUALLY
         "androidx.gridlayout_gridlayout",
-        "androidx.recyclerview_recyclerview",
-        "com.google.android.material_material",
-    ] + ["cr"],
+        "androidx.webkit_webkit",
+        "ExactCalculator_com.google.android.material_material",
+        "ExactCalculator_com.hp_crcalc",
+    ],
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 0c64c3b..418b854 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -74,11 +74,10 @@
 }
 
 dependencies {
-    implementation(files("cr.jar"))
-
     implementation("androidx.gridlayout:gridlayout:1.0.0")
     implementation("androidx.webkit:webkit:1.7.0")
     implementation("com.google.android.material:material:1.9.0")
+    implementation("com.hp:crcalc:1.0")
 }
 
 configure<GenerateBpPluginExtension> {
diff --git a/cr.jar b/cr.jar
deleted file mode 100644
index b631b0d..0000000
--- a/cr.jar
+++ /dev/null
Binary files differ
diff --git a/libs/Android.bp b/libs/Android.bp
new file mode 100644
index 0000000..3d3ef6a
--- /dev/null
+++ b/libs/Android.bp
@@ -0,0 +1,91 @@
+//
+// SPDX-FileCopyrightText: 2023 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+// DO NOT EDIT THIS FILE MANUALLY
+
+android_library_import {
+    name: "ExactCalculator_com.google.android.material_material-nodeps",
+    aars: ["com/google/android/material/material/1.9.0/material-1.9.0.aar"],
+    sdk_version: "34",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.appcompat_appcompat",
+        "androidx.cardview_cardview",
+        "androidx.coordinatorlayout_coordinatorlayout",
+        "androidx-constraintlayout_constraintlayout",
+        "androidx.core_core",
+        "androidx.drawerlayout_drawerlayout",
+        "androidx.dynamicanimation_dynamicanimation",
+        "androidx.annotation_annotation-experimental",
+        "androidx.fragment_fragment",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.recyclerview_recyclerview",
+        "androidx.transition_transition",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.viewpager2_viewpager2",
+        "error_prone_annotations",
+    ],
+}
+
+android_library {
+    name: "ExactCalculator_com.google.android.material_material",
+    sdk_version: "34",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    manifest: "com/google/android/material/material/1.9.0/AndroidManifest.xml",
+    static_libs: [
+        "ExactCalculator_com.google.android.material_material-nodeps",
+        "androidx.annotation_annotation",
+        "androidx.appcompat_appcompat",
+        "androidx.cardview_cardview",
+        "androidx.coordinatorlayout_coordinatorlayout",
+        "androidx-constraintlayout_constraintlayout",
+        "androidx.core_core",
+        "androidx.drawerlayout_drawerlayout",
+        "androidx.dynamicanimation_dynamicanimation",
+        "androidx.annotation_annotation-experimental",
+        "androidx.fragment_fragment",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.recyclerview_recyclerview",
+        "androidx.transition_transition",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.viewpager2_viewpager2",
+        "error_prone_annotations",
+    ],
+    java_version: "1.7",
+}
+
+java_import {
+    name: "ExactCalculator_com.hp_crcalc-nodeps",
+    jars: ["com/hp/crcalc/1.0/crcalc-1.0.jar"],
+    sdk_version: "34",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}
+
+java_library_static {
+    name: "ExactCalculator_com.hp_crcalc",
+    sdk_version: "34",
+    min_sdk_version: "14",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "ExactCalculator_com.hp_crcalc-nodeps",
+    ],
+    java_version: "1.7",
+}
diff --git a/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml b/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml
new file mode 100644
index 0000000..bff0c00
--- /dev/null
+++ b/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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="com.google.android.material" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="33" />
+
+    <application />
+
+</manifest>
\ No newline at end of file
diff --git a/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml.license b/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml.license
new file mode 100644
index 0000000..0a05400
--- /dev/null
+++ b/libs/com/google/android/material/material/1.9.0/AndroidManifest.xml.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2015-2023 The Android Open Source Project
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar b/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar
new file mode 100644
index 0000000..5778b67
--- /dev/null
+++ b/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar
Binary files differ
diff --git a/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar.license b/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar.license
new file mode 100644
index 0000000..0a05400
--- /dev/null
+++ b/libs/com/google/android/material/material/1.9.0/material-1.9.0.aar.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2015-2023 The Android Open Source Project
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/libs/com/hp/crcalc/1.0/crcalc-1.0.jar b/libs/com/hp/crcalc/1.0/crcalc-1.0.jar
new file mode 100644
index 0000000..4f472fe
--- /dev/null
+++ b/libs/com/hp/crcalc/1.0/crcalc-1.0.jar
Binary files differ
diff --git a/libs/com/hp/crcalc/1.0/crcalc-1.0.jar.license b/libs/com/hp/crcalc/1.0/crcalc-1.0.jar.license
new file mode 100644
index 0000000..b6336b8
--- /dev/null
+++ b/libs/com/hp/crcalc/1.0/crcalc-1.0.jar.license
@@ -0,0 +1,5 @@
+SPDX-FileCopyrightText: 2023 The Android Open Source Project
+SPDX-FileCopyrightText: 2023 Silicon Graphics, Inc.
+SPDX-FileCopyrightText: 2023 Hewlett-Packard Company
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a6bebf3..48f09e2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,6 +15,7 @@
     repositories {
         google()
         mavenCentral()
+        maven("https://raw.githubusercontent.com/lineage-next/crcalc/main/.m2")
     }
 }
 rootProject.name = "ExactCalculator"