From b22a363eb07485cd207ca7388fccfa39cc7e94b8 Mon Sep 17 00:00:00 2001 From: Li Feng Date: Fri, 30 Jun 2023 10:10:47 +1000 Subject: [PATCH] Force bazel to use d8 instead of dx for Android --- .bazelrc | 2 +- .bazelversion | 2 +- WORKSPACE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelrc b/.bazelrc index 4aded62b..9bc55034 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 diff --git a/.bazelversion b/.bazelversion index 91ff5727..ade65226 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -5.2.0 +5.4.1 diff --git a/WORKSPACE b/WORKSPACE index 592b32b2..6c5f6169 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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")