Skip to content

Commit 68fc8e9

Browse files
authored
no more dx on linux, use d8 to make it work
also they state that we can use any combination of "/*.class" but it doesn't work on linux OS so we have to go explicitly https://developer.android.com/studio/command-line/d8
1 parent 3f4feb4 commit 68fc8e9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/common.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ macro(nbl_android_create_apk _TARGET)
364364
)
365365
set(D8_SCRIPT "${ANDROID_BUILD_TOOLS}/d8.bat")
366366
if(NOT EXISTS ${D8_SCRIPT})
367-
set(DEX_COMMAND ${ANDROID_BUILD_TOOLS}/dx --dex --output=bin/classes.dex ./obj)
367+
set(DEX_COMMAND ${ANDROID_BUILD_TOOLS}/d8 ./obj/eu/devsh/${TARGET_NAME}/Loader.class --output ./bin/)
368368
else()
369369
set(DEX_COMMAND ${D8_SCRIPT} --output ./bin/ ./obj/eu/devsh/${TARGET_NAME}/*.class)
370370
endif()
@@ -587,4 +587,4 @@ endmacro()
587587

588588
macro(write_source_definitions NBL_FILE NBL_WRAPPER_CODE_TO_WRITE)
589589
file(WRITE "${NBL_FILE}" "${NBL_WRAPPER_CODE_TO_WRITE}")
590-
endmacro()
590+
endmacro()

0 commit comments

Comments
 (0)