holm/Unexpected-Keyboard
1
0
Fork 0
forked from extern/Unexpected-Keyboard
Code Pull Requests Activity

build: Use d8 instead of dx

Browse Source 
dx have been removed in android build tools >30.0.3 in favor of d8.
Lift the version constraint on the build tools.
This commit is contained in:
Jules Aguillon 2022-02-07 01:11:55 +01:00
parent 1ff8526d24
commit 75c736709d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -9,7 +9,7 @@ Android Studio.
Fortunately, there's not many dependencies: Fortunately, there's not many dependencies:
- OpenJDK 8 - OpenJDK 8
- Android SDK: build tools `30.0.3`, platform `30` - Android SDK: build tools (minimum `28.0.1`), platform `30`
- Make sure to have the `$ANDROID_HOME` environment variable set. - Make sure to have the `$ANDROID_HOME` environment variable set.
For Nix users, there's a `shell.nix` for setting-up the right environment. For Nix users, there's a `shell.nix` for setting-up the right environment.

2
Makefile
View File

@ -105,4 +105,4 @@ _build/classes.dex: $(JAVA_FILES) $(R_FILE)
-classpath $(ANDROID_PLATFORM)/android.jar:$(EXTRA_JARS) \ -classpath $(ANDROID_PLATFORM)/android.jar:$(EXTRA_JARS) \
-sourcepath $(SRC_DIR):$(GEN_DIR) \ -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))