From cf293fec37fdba9b534947ddd5e5e787d5f71d72 Mon Sep 17 00:00:00 2001 From: berstanio Date: Sat, 14 May 2022 03:54:01 -0700 Subject: [PATCH 1/3] Enable predexing and other proguard levels than all again. This is achieved with L8 --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 3df81ce..b157462 100644 --- a/build.gradle +++ b/build.gradle @@ -132,6 +132,8 @@ ext { external.moe_core.out.moe_core_javadoc_jar = file("${external.moe_core.root}/moe.apple/moe.core.java/build/libs/core/moe-core-javadoc.jar") external.moe_core.out.moe_core_sources_jar = file("${external.moe_core.root}/moe.apple/moe.core.java/build/libs/core/moe-core-sources.jar") external.moe_core.out.java8support_jar = file("${external.moe_core.root}/moe.apple/tools/java8support.jar") + external.moe_core.out.desugarjdk_jar = file("${external.moe_core.root}/moe.apple/tools/desugar_jdk_libs-1.1.5.jar") + external.moe_core.out.desugarjdk_json = file("${external.moe_core.root}/moe.apple/tools/desugar_jdk_libs.json") external.moe_core.out.preloaded_classes = file('../../../aosp/frameworks/base/preloaded-classes') external.moe_core.out.proguard_full_cfg = file("${external.moe_core.root}/moe.apple/tools/proguard-full.cfg") external.moe_core.out.proguard_cfg = file("${external.moe_core.root}/moe.apple/tools/proguard.cfg") From f7d6d9440598830d5026bbed73c2e66a0234bfbe Mon Sep 17 00:00:00 2001 From: berstanio Date: Sat, 14 May 2022 03:59:27 -0700 Subject: [PATCH 2/3] Remove all occurences of dx --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index b157462..f507ae4 100644 --- a/build.gradle +++ b/build.gradle @@ -138,8 +138,6 @@ ext { external.moe_core.out.proguard_full_cfg = file("${external.moe_core.root}/moe.apple/tools/proguard-full.cfg") external.moe_core.out.proguard_cfg = file("${external.moe_core.root}/moe.apple/tools/proguard.cfg") external.moe_core.out.retrolambda_jar = file("${external.moe_core.root}/moe.apple/tools/retrolambda-2.0.2.jar") - external.moe_core.out.dx_exec = file("${external.moe_core.root}/moe.apple/tools/prebuilts/dx") - external.moe_core.out.dx_jar = file("${external.moe_core.root}/moe.apple/tools/prebuilts/lib/dx.jar") if (project.hasProperty('moe.moe_core.dex2oat.debug')) { external.moe_core.out.dex2oat_exec = file("${external.moe_core.root}/moe.apple/moe.core.native/android.art.dex2oat/build/xcode/Debug-macos-macosx/dex2oat") From f1a9cb43eea9365bd4960c0a5a5c93cda172e059 Mon Sep 17 00:00:00 2001 From: Berstanio Date: Thu, 21 Jul 2022 22:40:19 +0200 Subject: [PATCH 3/3] Build r8 together with moe --- settings.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/settings.gradle b/settings.gradle index 87a5d60..e45e02a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,8 +31,4 @@ includeFlat 'moe.tools.common' includeFlat 'moe.tools.natjgen' includeFlat 'moe.tools.classvalidator' -include 'proguard-core', 'proguard', 'proguard:base', 'proguard:app' -project(':proguard-core').projectDir = new File('../../../external/proguard/proguard-core') -project(':proguard').projectDir = new File('../../../external/proguard/proguard') -project(':proguard:base').projectDir = new File('../../../external/proguard/proguard/base') -project(':proguard:app').projectDir = new File('../../../external/proguard/proguard/proguard-app') +includeBuild '../../../external/r8' \ No newline at end of file