From 9ff00ae78934c07c58f12b6b910581cc1e19988c Mon Sep 17 00:00:00 2001 From: bjorn Date: Tue, 7 Dec 2021 18:18:55 +0200 Subject: [PATCH] tup: use d8 instead of dx; --- Tupfile.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tupfile.lua b/Tupfile.lua index 0172394f..0891e5b1 100644 --- a/Tupfile.lua +++ b/Tupfile.lua @@ -486,7 +486,8 @@ if target == 'android' then jar = 'bin/lovr.jar' dex = 'bin/apk/classes.dex' - androidjar = ('%s/platforms/android-%d/android.jar'):format(config.android.sdk, config.android.version) + androidversion = config.android.version + androidjar = ('%s/platforms/android-%d/android.jar'):format(config.android.sdk, androidversion) extrajar = config.headsets.pico and 'deps/pico/classes.jar' or nil classpathsep = tup.getconfig('TUP_PLATFORM') == 'win32' and ';' or ':' classpath = table.concat({ androidjar, extrajar }, classpathsep) @@ -512,7 +513,7 @@ if target == 'android' then copy(activity, java) tup.rule(java, '^ JAVAC %b^ javac -classpath $(classpath) -d bin %f', binclass) tup.rule(binclass, '^ JAR %b^ jar -cf %o -C bin $(class)', jar) - tup.rule({ jar, extrajar }, '^ DX %b^ $(tools)/dx --dex --output %o %f', dex) + tup.rule({ jar, extrajar }, '^ D8 %b^ $(tools)/d8 --min-api $(androidversion) --output bin/apk %f', dex) tup.rule( { 'bin/AndroidManifest.xml', extra_inputs = { lib('*'), dex } }, '^ AAPT %b^ $(tools)/aapt package $(package) -F %o -M %f -0 so -I $(androidjar) $(project) bin/apk',