diff --git a/Android.bp b/Android.bp
index 7d83217..4c25331 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,11 +47,21 @@
     path: "src",
 }
 
+// The OmniRom Platform Framework Library
+// ============================================================
+
+omnirom_sdk_LOCAL_STATIC_JAVA_LIBRARIES = [
+    "vendor.lineage.health-V1-java",
+]
+
 // Used by services
 java_library {
     name: "omnirom.internal",
+    static_libs: omnirom_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
     srcs: [
         "src/org/omnirom/omnilib/utils/*.java",
+        "sdk/**/*.java",
+        "sdk/**/I*.aidl",
 
          // For the generated R.java and Manifest.java
         ":omnirom-res{.aapt.srcjar}",
@@ -62,9 +72,12 @@
     name: "OmniLib",
     installable: true,
     sdk_version: "core_platform",
+    static_libs: omnirom_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
 
     srcs: [
         "src/**/*.java",
+        "sdk/**/*.java",
+        "sdk/**/I*.aidl",
 
         // For the generated R.java and Manifest.java
         ":omnirom-res{.aapt.srcjar}",
@@ -75,4 +88,9 @@
         "OmniPreference",
         "services",
     ],
+
+    // Include aidl files from omnirom.app namespace as well as internal src aidl files
+    aidl: {
+        local_include_dirs: ["sdk/src"],
+    },
 }