From e3bead4b5bc2678adb39d6a673aa30a3eea9fe0c Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 13 Jul 2019 07:54:41 -0400 Subject: [PATCH] build: support for jdk9+ build --- brut.apktool/apktool-cli/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle index e2bee13e..da2f4fd6 100644 --- a/brut.apktool/apktool-cli/build.gradle +++ b/brut.apktool/apktool-cli/build.gradle @@ -43,7 +43,12 @@ task cleanOutputDirectory(type: Delete) { task proguard(type: proguard.gradle.ProGuardTask, dependsOn: shadowJar) { injars shadowJar.archivePath - libraryjars "${System.properties['java.home']}/lib/rt.jar" + // Java 9 and prior uses merged package for runtime, later uses split jmod files. + if (System.getProperty("java.version").startsWith('1.')) { + libraryjars "${System.properties['java.home']}/lib/rt.jar" + } else { + libraryjars "${System.getProperty('java.home')}/jmods/java.base.jmod", jarfilter: '!**.jar', filter: '!module-info.class' + } dontobfuscate dontoptimize