diff --git a/edxp-common/build.gradle b/edxp-common/build.gradle
index cfd1c2af..50985329 100644
--- a/edxp-common/build.gradle
+++ b/edxp-common/build.gradle
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compileOnly files("${hiddenApiStubJarFilePath}")
+    compileOnly project(':hiddenapi-stubs')
     implementation project(':xposed-bridge')
     compileOnly project(':dexmaker')
 }
diff --git a/hiddenapi-stubs/.gitignore b/hiddenapi-stubs/.gitignore
index 97873191..796b96d1 100644
--- a/hiddenapi-stubs/.gitignore
+++ b/hiddenapi-stubs/.gitignore
@@ -1,2 +1 @@
 /build
-/libs
diff --git a/hiddenapi-stubs/build.gradle b/hiddenapi-stubs/build.gradle
index 496ba777..14de44ba 100644
--- a/hiddenapi-stubs/build.gradle
+++ b/hiddenapi-stubs/build.gradle
@@ -4,12 +4,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 28
-    // Only build the release variant
-    variantFilter { variant ->
-        if (variant.buildType.name != BuilderConstants.RELEASE) {
-            variant.ignore = true
-        }
-    }
 }
 
 task makeStubJar(type: Jar){
@@ -21,8 +15,8 @@ task makeStubJar(type: Jar){
     exclude{ it.name.startsWith('R$')}
 }
 
-makeStubJar.dependsOn(build)
-
 afterEvaluate {
-    makeStubJar
-}
\ No newline at end of file
+    tasks.withType(JavaCompile) {
+        it.finalizedBy(makeStubJar)
+    }
+}
diff --git a/hiddenapi-stubs/libs/framework-stub.jar b/hiddenapi-stubs/libs/framework-stub.jar
new file mode 100644
index 00000000..6ae1ebde
Binary files /dev/null and b/hiddenapi-stubs/libs/framework-stub.jar differ
diff --git a/xposed-bridge/build.gradle b/xposed-bridge/build.gradle
index ce94b0e1..b84841c6 100644
--- a/xposed-bridge/build.gradle
+++ b/xposed-bridge/build.gradle
@@ -39,7 +39,7 @@ preBuild.doLast {
 }
 
 dependencies {
-    compileOnly files("${hiddenApiStubJarFilePath}")
+    compileOnly project(':hiddenapi-stubs')
     compileOnly project(':dexmaker')
 }