Skip to content

Commit 6586744

Browse files
ted-xiecopybara-github
authored andcommitted
Merge #379 by ted-xie: Fix bazelci presubmit issues
Also clean up various java runtime and language flags. Closes #379 COPYBARA_INTEGRATE_REVIEW=#379 from ted-xie:fix_presubmit edde7c5 PiperOrigin-RevId: 775784358 Change-Id: Ieeb017d7b52656a29d80a712c03e2552ef96f639
1 parent 244ec80 commit 6586744

4 files changed

Lines changed: 4 additions & 6 deletions

File tree

.bazelci/presubmit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ matrix:
1010
tools_flags: &tools_flags
1111
? "--enable_bzlmod=false"
1212
? "--enable_workspace=true"
13-
# Sandboxed SDK tools depend on libraries that require Java runtime 17 or higher.
14-
? "--java_runtime_version=17"
1513
rules_flags: &rules_flags
1614
? "--enable_bzlmod=false"
1715
? "--enable_workspace=true"

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
common --java_language_version=17
12
common --java_runtime_version=17
23
common --tool_java_language_version=17
4+
common --tool_java_runtime_version=17
35

46
# Workaround for a rules_java + bazel < 8.3.0 issue. It should only be relevant
57
# for bazel@HEAD and rolling releases.

examples/basicapp/.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ common:core_library_desugaring --desugar_java8_libs
44
# Flags to enable mobile-install v3
55
mobile-install --mode=skylark --mobile_install_aspect=@rules_android//mobile_install:mi.bzl --mobile_install_supported_rules=android_binary
66
# Required to build Android builder tools
7+
common --java_language_version=17
8+
common --java_runtime_version=17
79
common --tool_java_language_version=17
810
# Required to invoke the Studio deployer jar
911
common --tool_java_runtime_version=17

kokoro/presubmit/presubmit_main.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ function main() {
100100
"--sandbox_tmpfs_path=$hsperfdata_dir"
101101
"--disk_cache=$disk_cache"
102102
"--verbose_failures"
103-
"--experimental_google_legacy_api"
104-
"--experimental_enable_android_migration_apis"
105-
"--java_language_version=11"
106-
"--java_runtime_version=17"
107103
)
108104

109105
TEST_ARGS=(

0 commit comments

Comments
 (0)