From 4d67642cbdb062882cf9cc1226722da05d0e457b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 4 Oct 2016 09:35:23 -0700 Subject: [PATCH] Fix toc path toc path was including the build directory twice, which breaks builds with absolute paths to the build directory. Test: m -j Bug: 26014946 Change-Id: Ibc0856d1b22a44ec0c297f5dd84a932fde9f20af --- cc/library.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/library.go b/cc/library.go index 53c9a580c..5a7afe19e 100644 --- a/cc/library.go +++ b/cc/library.go @@ -453,7 +453,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, // that is run during the build, use the library directly so // that the timestamp of the binary changes whenever a library // changes and any necessary tools get re-run. - tocPath := outputFile.String() + tocPath := outputFile.RelPathString() tocPath = pathtools.ReplaceExtension(tocPath, flags.Toolchain.ShlibSuffix()[1:]+".toc") tocFile := android.PathForOutput(ctx, tocPath) library.tocFile = android.OptionalPathForPath(tocFile)