|  | @@ -18,7 +18,7 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -build --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain
 | 
	
		
			
				|  |  | +build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain
 | 
	
		
			
				|  |  |  build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default
 | 
	
		
			
				|  |  |  # Use custom execution platforms defined in third_party/toolchains
 | 
	
		
			
				|  |  |  build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large
 | 
	
	
		
			
				|  | @@ -59,9 +59,9 @@ build:msan --cxxopt=--stdlib=libc++
 | 
	
		
			
				|  |  |  # setting LD_LIBRARY_PATH is necessary
 | 
	
		
			
				|  |  |  # to avoid "libc++.so.1: cannot open shared object file"
 | 
	
		
			
				|  |  |  build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib
 | 
	
		
			
				|  |  | -build:msan --host_crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain
 | 
	
		
			
				|  |  | +build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain
 | 
	
		
			
				|  |  |  # override the config-agnostic crosstool_top
 | 
	
		
			
				|  |  | -build:msan --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan:toolchain
 | 
	
		
			
				|  |  | +build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan:toolchain
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # thread sanitizer: most settings are already in %workspace%/.bazelrc
 | 
	
		
			
				|  |  |  # we only need a few additional ones that are Foundry specific
 | 
	
	
		
			
				|  | @@ -76,7 +76,7 @@ build:ubsan --copt=-gmlt
 | 
	
		
			
				|  |  |  # TODO(jtattermusch): use more reasonable test timeout
 | 
	
		
			
				|  |  |  build:ubsan --test_timeout=3600
 | 
	
		
			
				|  |  |  # override the config-agnostic crosstool_top
 | 
	
		
			
				|  |  | ---crosstool_top=@bazel_toolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan:toolchain
 | 
	
		
			
				|  |  | +--crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan:toolchain
 | 
	
		
			
				|  |  |  # TODO(jtattermusch): remove this once Foundry adds the env to the docker image.
 | 
	
		
			
				|  |  |  # ubsan needs symbolizer to work properly, otherwise the suppression file doesn't work
 | 
	
		
			
				|  |  |  # and we get test failures.
 |