abouttreesummaryrefslogcommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJules Aguillon2022-02-07 01:11:55 +0100
committerJules Aguillon2022-02-07 01:11:55 +0100
commit75c736709dd064107e37db028baac9710f59b714 (patch)
treef63fd16baab2e28ad18c3a8a34268fce3c723e58 /Makefile
parent1ff8526d24787427bdaeffae63c88bbe12b031a5 (diff)
downloadunexpected-keyboard-75c736709dd064107e37db028baac9710f59b714.tar.gz
unexpected-keyboard-75c736709dd064107e37db028baac9710f59b714.zip
build: Use d8 instead of dx
dx have been removed in android build tools >30.0.3 in favor of d8. Lift the version constraint on the build tools.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 10f7fb4..7a8f7f8 100644
--- a/Makefile
+++ b/Makefile
@@ -105,4 +105,4 @@ _build/classes.dex: $(JAVA_FILES) $(R_FILE)
-classpath $(ANDROID_PLATFORM)/android.jar:$(EXTRA_JARS) \
-sourcepath $(SRC_DIR):$(GEN_DIR) \
$^
- $(ANDROID_BUILD_TOOLS)/dx --dex --output="$@" $(OBJ_DIR) $(subst :, ,$(EXTRA_JARS))
+ $(ANDROID_BUILD_TOOLS)/d8 --output $(@D) $(OBJ_DIR)/*/*/* $(subst :, ,$(EXTRA_JARS))