aprantl accepted this revision. aprantl added a comment. This revision is now accepted and ready to land. If the module map is using an umbrella directory, then this will automatically work. Thanks! https://reviews.llvm.org/D42594