Bug 1231764 - part 2 - pass the srcdir of an rlib in the moz.build object; r=chmanchester

python/mozbuild/mozbuild/frontend/data.py

@@ -448,9 +448,10 @@ class Library(BaseLibrary):
 class RustRlibLibrary(Library):
     """Context derived container object for a Rust rlib"""
 
-    def __init__(self, context, basename, crate_name, rlib_filename, link_into):
+    def __init__(self, context, basename, crate_name, srcdir, rlib_filename, link_into):
         Library.__init__(self, context, basename)
         self.crate_name = crate_name
+        self.srcdir = srcdir
         self.rlib_filename = rlib_filename
         self.link_into = link_into
 

python/mozbuild/mozbuild/frontend/emitter.py

@@ -725,6 +725,7 @@ class TreeMetadataEmitter(LoggingMixin):
                     crate_name = context.relsrcdir.replace('/', '_') + '_' + base
                     rlib_filename = 'lib' + base + '.rlib'
                     lib = RustRlibLibrary(context, libname, crate_name,
+                                          mozpath.join(context.srcdir, mozpath.dirname(f)),
                                           rlib_filename, final_lib)
                     self._libs[libname].append(lib)
                     self._linkage.append((context, lib, 'USE_LIBS'))