diff --git a/Android.bp b/Android.bp
index 8942c9d..73fb6b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,8 +4,9 @@
         "SettingsLibDefaults",
         "SettingsLib-search-defaults",
     ],
-    platform_apis: true,
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+    ],
     required: [
         "privapp_whitelist_com.android.settings",
         "settings-platform-compat-config",
@@ -16,3 +17,9 @@
     ],
     resource_dirs: ["res"],
 }
+
+android_library {
+    name: "OmniLibCore",
+    platform_apis: true,
+    srcs: ["core/**/*.java"],
+}