diff --git a/Android.bp b/Android.bp
index ed16ca2..ddcebd0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,9 +34,6 @@
     },
 
     no_standard_libs: true,
-    libs: [
-        "core-oj",
-        "core-libart",
-    ],
-    system_modules: "core-system-modules",
+    libs: ["core-all"],
+    system_modules: "core-all-system-modules",
 }