Use packaged toolchain in test_compiler.
The packaging step customizes the toolchain, including installing
compiler wrappers, and overwriting clang's stdatomic.h with that from
bionic. Use the packaged toolchain so the test_compiler's test is
closer to a real build.
Also don't explicitly install compiler wrapper in test_compiler.py since
all invocation options will now have the wrapper already installed.
Test: test_compiler.py
Change-Id: If4405f3df73276e2c53fffb0b9986ef47b6e7a2f
diff --git a/test_compiler.py b/test_compiler.py
index ab9def2..3c80f23 100755
--- a/test_compiler.py
+++ b/test_compiler.py
@@ -292,8 +292,18 @@
build_instrumented=instrumented,
profdata_file=profdata)
build.build_runtimes(stage2_install)
- version = build.extract_clang_version(stage2_install)
- return stage2_install, version
+
+ build.package_toolchain(
+ stage2_install,
+ 'dev',
+ utils.build_os_type(),
+ dist_dir=None,
+ strip=True,
+ create_tar=False)
+
+ clang_path = build.get_package_install_path(utils.build_os_type(), 'clang-dev')
+ version = build.extract_clang_version(clang_path)
+ return clang_path, version
def extract_packaged_clang(package_path):
@@ -339,7 +349,6 @@
else:
clang_path, clang_version = build_clang(
instrumented=args.profile, pgo=(not args.no_pgo))
- build.install_wrappers(clang_path)
link_clang(args.android_path, clang_path)
if args.build_only:
