Merge pull request #148 from Snapchat/lf/d8

li-feng-sc · web-flow · commit 1c546f9d9834 · 2023-07-05T16:01:37.000+10:00
Force bazel to use d8 instead of dx for Android
diff --git 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
@@ -1 +1 @@
-5.2.0
+5.4.1
diff --git 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")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-build --cxxopt=-std=c++17 --incompatible_java_common_parameters=false`
	`1`	`+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`