fixup! squash! Modify build system

2 jobs for bug_40143_00