Skip to content

Commit

Permalink
Merge pull request #148 from Snapchat/lf/d8
Browse files Browse the repository at this point in the history
Force bazel to use d8 instead of dx for Android
  • Loading branch information
li-feng-sc authored Jul 5, 2023
2 parents 046a4b3 + b22a363 commit 1c546f9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
build --cxxopt=-std=c++17 --incompatible_java_common_parameters=false
build --cxxopt=-std=c++17 --incompatible_java_common_parameters=false --define=android_dexmerger_tool=d8_dexmerger --define=android_incremental_dexing_tool=d8_dexbuilder --nouse_workers_with_dexbuilder
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.0
5.4.1
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ djinni_setup_deps()
# --- Everything below is only used for examples and tests

# android_sdk_repository fails to find build_tools if we don't explicitly set a version.
android_sdk_repository(name = "androidsdk", build_tools_version = "32.0.0")
android_sdk_repository(name = "androidsdk")
android_ndk_repository(name = "androidndk", api_level = 21)

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
Expand Down

0 comments on commit 1c546f9

Please sign in to comment.