Snap for 10103804 from 321a057530dea4e6d210c8542ecf0909ff1177cb to mainline-tzdata5-release
Change-Id: I44a180927f5c655291258ad97ee61932af49b652
diff --git a/android_tools/BUILD b/android_tools/BUILD
new file mode 100644
index 0000000..b78dca2
--- /dev/null
+++ b/android_tools/BUILD
@@ -0,0 +1,16 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+ name = "all_android_tools_deploy.jar",
+ srcs = ["android_tools/all_android_tools_deploy.jar"],
+)
+
+filegroup(
+ name = "desugar_jdk_libs.jar",
+ srcs = ["android_tools/desugar_jdk_libs.jar"],
+)
+
+filegroup(
+ name = "ImportDepsChecker_deploy.jar",
+ srcs = ["android_tools/ImportDepsChecker_deploy.jar"],
+)
diff --git a/android_tools/WORKSPACE b/android_tools/WORKSPACE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/android_tools/WORKSPACE
diff --git a/android_tools/android_tools/ImportDepsChecker_deploy.jar b/android_tools/android_tools/ImportDepsChecker_deploy.jar
new file mode 100755
index 0000000..34930d8
--- /dev/null
+++ b/android_tools/android_tools/ImportDepsChecker_deploy.jar
Binary files differ
diff --git a/android_tools/android_tools/all_android_tools_deploy.jar b/android_tools/android_tools/all_android_tools_deploy.jar
new file mode 100755
index 0000000..043f9d0
--- /dev/null
+++ b/android_tools/android_tools/all_android_tools_deploy.jar
Binary files differ
diff --git a/android_tools/android_tools/desugar_jdk_libs.jar b/android_tools/android_tools/desugar_jdk_libs.jar
new file mode 100755
index 0000000..120e13e
--- /dev/null
+++ b/android_tools/android_tools/desugar_jdk_libs.jar
Binary files differ
diff --git a/bazel-complete.bash b/bazel-complete.bash
index 8dbd93b..5fcba06 100755
--- a/bazel-complete.bash
+++ b/bazel-complete.bash
@@ -884,8 +884,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -931,6 +929,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -1285,8 +1287,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -1375,7 +1375,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -1462,6 +1462,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -1481,6 +1483,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -1604,6 +1608,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -2195,8 +2201,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -2285,7 +2289,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -2369,6 +2373,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -2388,6 +2394,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -2495,6 +2503,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -3057,8 +3067,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -3147,7 +3155,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -3232,6 +3240,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -3251,6 +3261,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -3358,6 +3370,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -3923,8 +3937,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -4013,7 +4025,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -4100,6 +4112,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -4119,6 +4133,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -4226,6 +4242,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -4791,8 +4809,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -4881,7 +4897,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -4965,6 +4981,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -4984,6 +5002,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -5091,6 +5111,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -5653,8 +5675,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -5743,7 +5763,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -5827,6 +5847,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -5846,6 +5868,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -5953,6 +5977,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -6521,8 +6547,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -6611,7 +6635,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -6698,6 +6722,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -6717,6 +6743,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -6832,6 +6860,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -7266,8 +7296,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -7313,6 +7341,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -7510,8 +7542,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -7577,6 +7607,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -7630,6 +7664,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_rule_name_parameter
--noincompatible_remove_rule_name_parameter
--incompatible_require_linker_input_cc_api
@@ -7812,8 +7848,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -7860,6 +7894,10 @@
--heap_dump_on_oom
--noheap_dump_on_oom
--help_verbosity={long,medium,short}
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -8213,8 +8251,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -8303,7 +8339,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -8387,6 +8423,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -8406,6 +8444,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -8513,6 +8553,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -8907,8 +8949,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -8954,6 +8994,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -9309,8 +9353,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -9399,7 +9441,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -9483,6 +9525,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -9502,6 +9546,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -9609,6 +9655,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -10014,8 +10062,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -10064,6 +10110,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -10428,8 +10478,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -10518,7 +10566,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -10602,6 +10650,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -10621,6 +10671,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -10728,6 +10780,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -11130,8 +11184,6 @@
--noexperimental_graphless_query
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -11201,6 +11253,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -11264,6 +11320,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_rule_name_parameter
--noincompatible_remove_rule_name_parameter
--incompatible_require_linker_input_cc_api
@@ -11652,8 +11710,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -11742,7 +11798,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -11826,6 +11882,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -11845,6 +11903,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -11952,6 +12012,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -12345,8 +12407,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -12392,6 +12452,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--iff_heap_size_greater_than=
--ignore_dev_dependency
@@ -12582,8 +12646,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -12649,6 +12711,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -12702,6 +12768,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_rule_name_parameter
--noincompatible_remove_rule_name_parameter
--incompatible_require_linker_input_cc_api
@@ -13053,8 +13121,6 @@
--noexperimental_google_legacy_api
--experimental_guard_against_concurrent_changes
--noexperimental_guard_against_concurrent_changes
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_import_deps_checking={off,warning,error}
--experimental_include_xcode_execution_requirements
--noexperimental_include_xcode_execution_requirements
@@ -13143,7 +13209,7 @@
--experimental_run_validations
--noexperimental_run_validations
--experimental_sandbox_async_tree_delete_idle_threads=
---experimental_sandbox_memory_limit=
+--experimental_sandbox_memory_limit_mb=
--experimental_sandboxfs_map_symlink_targets
--noexperimental_sandboxfs_map_symlink_targets
--experimental_sandboxfs_path=
@@ -13227,6 +13293,8 @@
--grte_top=label
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
--high_priority_workers=
--host_action_env=
--host_compilation_mode={fastbuild,dbg,opt}
@@ -13246,6 +13314,8 @@
--host_per_file_copt=
--host_platform=label
--host_swiftcopt=
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
@@ -13353,6 +13423,8 @@
--noincompatible_remote_results_ignore_disk
--incompatible_remote_symlinks
--noincompatible_remote_symlinks
+--incompatible_remote_use_new_exit_code_for_lost_inputs
+--noincompatible_remote_use_new_exit_code_for_lost_inputs
--incompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--noincompatible_remove_cpu_and_compiler_attributes_from_cc_toolchain
--incompatible_remove_legacy_whole_archive
@@ -13751,8 +13823,6 @@
--noexperimental_get_fixed_configured_action_env
--experimental_google_legacy_api
--noexperimental_google_legacy_api
---experimental_heuristically_drop_nodes
---noexperimental_heuristically_drop_nodes
--experimental_lazy_template_expansion
--noexperimental_lazy_template_expansion
--experimental_oom_more_eagerly_threshold=
@@ -13800,6 +13870,10 @@
--grpc_keepalive_timeout=
--heap_dump_on_oom
--noheap_dump_on_oom
+--heuristically_drop_nodes
+--noheuristically_drop_nodes
+--http_connector_attempts=
+--http_connector_retry_max_timeout=
--http_timeout_scaling=
--ignore_dev_dependency
--noignore_dev_dependency
diff --git a/r8/BUILD.bazel b/r8/BUILD.bazel
new file mode 100644
index 0000000..12c87b7
--- /dev/null
+++ b/r8/BUILD.bazel
@@ -0,0 +1,19 @@
+# Copyright (C) 2023 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+java_import(
+ name = "r8_jar_import",
+ jars = ["r8.jar"],
+ visibility = ["//visibility:public"],
+)
diff --git a/r8/LICENSE b/r8/LICENSE
new file mode 120000
index 0000000..c17b493
--- /dev/null
+++ b/r8/LICENSE
@@ -0,0 +1 @@
+../../../r8/LICENSE
\ No newline at end of file
diff --git a/r8/r8.jar b/r8/r8.jar
new file mode 100644
index 0000000..9e99264
--- /dev/null
+++ b/r8/r8.jar
Binary files differ
diff --git a/release_bazel.py b/release_bazel.py
index 3d01e86..f944706 100755
--- a/release_bazel.py
+++ b/release_bazel.py
@@ -127,7 +127,7 @@
return match_group.group(1)
-def ensure_commit_is_new(target_commit):
+def ensure_commit_is_new(target_commit, bazel_src_dir):
"""Verify that the target commit is newer than the current Bazel."""
curr_commit = current_bazel_commit()
@@ -143,6 +143,19 @@
"in the case that updating other tools failed), specify -f.")
sys.exit(1)
+ result = subprocess.run(
+ ["git", "merge-base", "--is-ancestor", curr_commit, target_commit],
+ cwd=bazel_src_dir,
+ check=False)
+ if result.returncode != 0:
+ print(f"Requested commit {target_commit} is not a descendant of " +
+ f"current Bazel binary commit {curr_commit}. Are you trying to " +
+ "update to an older commit?\n" +
+ "To force an update anyway, specify -f.")
+ sys.exit(1)
+
+
+def checkout_bazel_at(commit):
clone_dir = temp_dir_path("bazelsrc")
print(f"Cloning Bazel into {clone_dir}...")
result = subprocess.run(
@@ -155,15 +168,12 @@
bazel_src_dir = clone_dir.joinpath("bazel")
result = subprocess.run(
- ["git", "merge-base", "--is-ancestor", curr_commit, target_commit],
+ ["git", "checkout", commit],
cwd=bazel_src_dir,
check=False)
if result.returncode != 0:
- print(f"Requested commit {target_commit} is not a descendant of " +
- f"current Bazel binary commit {curr_commit}. Are you trying to " +
- "update to an older commit?\n" +
- "To force an update anyway, specify -f.")
- sys.exit(1)
+ print("Sync @%s failed." % commit)
+ return bazel_src_dir
def ensure_projects_clean():
@@ -182,7 +192,7 @@
sys.exit(1)
-def run_update(commit):
+def run_update(commit, bazel_src_dir):
"""Run the update script to update prebuilts.
Retrieves a prebuilt bazel at the given commit, and updates other checked
@@ -192,7 +202,7 @@
print_step_header("Updating prebuilts...")
update_script_path = pathlib.Path(UPDATE_SCRIPT_PATH).resolve()
- cmd_args = [f"./{update_script_path.name}", commit]
+ cmd_args = [f"./{update_script_path.name}", commit, str(bazel_src_dir.absolute())]
target_cwd = update_script_path.parent.absolute()
print(f"Runnning update script (CWD: {target_cwd}): {' '.join(cmd_args)}")
if not dry_run:
@@ -308,10 +318,11 @@
if not args.verify_only:
commit = target_update_commit(args)
+ bazel_src_dir = checkout_bazel_at(commit)
if not args.force:
- ensure_commit_is_new(commit)
+ ensure_commit_is_new(commit, bazel_src_dir)
ensure_projects_clean()
- run_update(commit)
+ run_update(commit, bazel_src_dir)
verify_update()
create_commits()
diff --git a/remote_java_tools/BUILD b/remote_java_tools/BUILD
index 87b3cb7..fb06e2c 100644
--- a/remote_java_tools/BUILD
+++ b/remote_java_tools/BUILD
@@ -52,3 +52,21 @@
visibility = ["//visibility:public"],
runtime_deps = [":proguard_import"],
)
+
+# The java tools contain sources for the below targets, which are a
+# fallback when a prebuilt is not available on a given platform. We
+# don't currently need these, but the below aliases let
+# @bazel_tools//tools/jdk:ijar_prebuilt_binary_or_cc_binary and
+# @bazel_tools//tools/jdk:singlejar_prebuilt_or_cc_binary resolve
+# under any condition, which in turn enables bazel queries on targets
+# that depend on them (e.g. default java toolchains).
+
+alias(
+ name = "ijar_cc_binary",
+ actual = "@remote_java_tools_linux//:ijar_prebuilt_binary",
+)
+
+alias(
+ name = "singlejar_cc_bin",
+ actual = "@remote_java_tools_linux//:prebuilt_singlejar",
+)
diff --git a/remote_java_tools/java_tools/GenClass_deploy.jar b/remote_java_tools/java_tools/GenClass_deploy.jar
index 6e55b1c..bf792d4 100755
--- a/remote_java_tools/java_tools/GenClass_deploy.jar
+++ b/remote_java_tools/java_tools/GenClass_deploy.jar
Binary files differ
diff --git a/remote_java_tools/java_tools/JavaBuilder_deploy.jar b/remote_java_tools/java_tools/JavaBuilder_deploy.jar
index 2282b28..8ecc89d 100755
--- a/remote_java_tools/java_tools/JavaBuilder_deploy.jar
+++ b/remote_java_tools/java_tools/JavaBuilder_deploy.jar
Binary files differ
diff --git a/remote_java_tools/java_tools/Runner_deploy.jar b/remote_java_tools/java_tools/Runner_deploy.jar
index 6b7c56c..215f26a 100755
--- a/remote_java_tools/java_tools/Runner_deploy.jar
+++ b/remote_java_tools/java_tools/Runner_deploy.jar
Binary files differ
diff --git a/remote_java_tools/java_tools/VanillaJavaBuilder_deploy.jar b/remote_java_tools/java_tools/VanillaJavaBuilder_deploy.jar
index c3ffb4a..c720ec2 100755
--- a/remote_java_tools/java_tools/VanillaJavaBuilder_deploy.jar
+++ b/remote_java_tools/java_tools/VanillaJavaBuilder_deploy.jar
Binary files differ
diff --git a/remote_java_tools/java_tools/turbine_direct_binary_deploy.jar b/remote_java_tools/java_tools/turbine_direct_binary_deploy.jar
index 73fa260..bfca4da 100755
--- a/remote_java_tools/java_tools/turbine_direct_binary_deploy.jar
+++ b/remote_java_tools/java_tools/turbine_direct_binary_deploy.jar
Binary files differ
diff --git a/update.sh b/update.sh
index 3d91b46..5e513c6 100755
--- a/update.sh
+++ b/update.sh
@@ -6,7 +6,7 @@
#
# Usage: update.sh <commit>
-set -euo pipefail
+set -euox pipefail
function err() {
>&2 echo "$@"
@@ -28,6 +28,7 @@
check_prereqs
commit="$1"; shift
+bazel_src_dir="$1"; shift
ci_url="https://storage.googleapis.com/bazel-builds/metadata/${commit}.json"
platforms_json="$(curl -s "${ci_url}" | jq '{ platforms: .platforms }')"
@@ -77,14 +78,14 @@
cd ../linux-x86_64
linux_bazel_dir=$(pwd)
download_and_verify "linux" "${linux_nojdk_url}" "${linux_nojdk_sha256}"
-downloaded_file="bazel_nojdk-${commit}-linux-x86_64"
+linux_downloaded_file=${downloaded_file}
./${downloaded_file} license > LICENSE
cp LICENSE ../common/
# Update macOS binary.
cp LICENSE "../darwin-x86_64/"
cd "../darwin-x86_64"
download_and_verify "darwin" "${darwin_nojdk_url}" "${darwin_nojdk_sha256}"
-${common_bazel_dir}/update_tools.sh "$commit" "$common_bazel_dir" "$linux_bazel_dir"
+${common_bazel_dir}/update_tools.sh "$linux_bazel_dir/$linux_downloaded_file" "$common_bazel_dir" "$linux_bazel_dir" "$bazel_src_dir"
echo "Done. This script may have affected all of prebuilts/bazel/common, prebuilts/bazel/linux-x86_64 and prebuilts/bazel/darwin-x86_64. Be sure to upload changes for all affected git repositories."
diff --git a/update_tools.sh b/update_tools.sh
index 1aa1d03..a7ed1dd 100755
--- a/update_tools.sh
+++ b/update_tools.sh
@@ -31,22 +31,25 @@
fi
}
+BAZEL_BUILD_FLAGS=(
+ --incompatible_sandbox_hermetic_tmp
+ --verbose_failures
+)
+
check_prereqs
-commit="$1"; shift
+new_bazel="$1"; shift
common_bazel_dir="$1"; shift
linux_bazel_dir="$1"; shift
-echo "checking out bazel..."
+bazel_src_dir="$1"; shift
cd $(mktemp -d)
-git clone https://github.com/bazelbuild/bazel.git
-cd bazel
-git checkout ${commit}
-echo "gathering external repository data..."
-/usr/bin/bazel-real build src:bazel_nojdk
-./bazel-bin/src/bazel_nojdk query "//external:remote_java_tools + //external:remote_java_tools_linux" --output=xml > repo_infos.xml
+touch WORKSPACE
+$new_bazel query "//external:remote_java_tools + //external:remote_java_tools_linux + //external:android_tools" --output=xml > repo_infos.xml
remote_java_tools_url=$(xmllint --xpath "/query/rule[@name='//external:remote_java_tools']/list[@name='urls']/string[1]/@value" repo_infos.xml|sed -e "s/ value=\"//"|sed -e "s/\"//")
remote_java_tools_sha256=$(xmllint --xpath "/query/rule[@name='//external:remote_java_tools']/string[@name='sha256']/@value" repo_infos.xml|sed -e "s/ value=\"//"|sed -e "s/\"//")
remote_java_tools_linux_url=$(xmllint --xpath "/query/rule[@name='//external:remote_java_tools_linux']/list[@name='urls']/string[1]/@value" repo_infos.xml|sed -e "s/ value=\"//"|sed -e "s/\"//")
remote_java_tools_linux_sha256=$(xmllint --xpath "/query/rule[@name='//external:remote_java_tools_linux']/string[@name='sha256']/@value" repo_infos.xml|sed -e "s/ value=\"//"|sed -e "s/\"//")
+android_tools_url=$(xmllint --xpath "/query/rule[@name='//external:android_tools']/list[@name='urls']/string[1]/@value" repo_infos.xml|sed -e "s/ value=\"//"|sed -e "s/\"//")
+android_tools_sha256=$(xmllint --xpath "/query/rule[@name='//external:android_tools']/string[@name='sha256']/@value" repo_infos.xml|sed -e "s/ value=\"//"|sed -e "s/\"//")
echo "downloading remote_java_tools..."
curl "${remote_java_tools_url}" --output java_tools.zip
@@ -57,6 +60,15 @@
unzip -o -d ${common_bazel_dir}/remote_java_tools java_tools.zip "java_tools/${jar}"
done
+echo "downloading android_tools..."
+curl "${android_tools_url}" --output android_tools.zip
+check_sha256 "${android_tools_sha256}" "android_tools.zip"
+android_jars=("all_android_tools_deploy.jar" "ImportDepsChecker_deploy.jar" "desugar_jdk_libs.jar")
+for jar in "${android_jars[@]}"
+do
+ unzip -o -d ${common_bazel_dir}/android_tools android_tools.zip "android_tools/${jar}"
+done
+
echo "downloading remote_java_tools_linux..."
curl "${remote_java_tools_linux_url}" --output java_tools_prebuilt.zip
check_sha256 "${remote_java_tools_linux_sha256}" "java_tools_prebuilt.zip"
@@ -67,5 +79,6 @@
done
echo "building autocompletion script..."
-/usr/bin/bazel-real build //scripts:bazel-complete.bash
+cd $bazel_src_dir
+$new_bazel build "${BAZEL_BUILD_FLAGS[@]}" //scripts:bazel-complete.bash
cp bazel-bin/scripts/bazel-complete.bash ${common_bazel_dir}/bazel-complete.bash
