diff options
| author | Colin Cross <ccross@android.com> | 2016-10-04 09:35:23 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-10-04 09:36:43 -0700 |
| commit | 4d67642cbdb062882cf9cc1226722da05d0e457b (patch) | |
| tree | 04ae8a1b28a3396498bcc882f91d508bf8358c7b /cc | |
| parent | 26c34ede294735354d75a5f511d9afd39dc8013c (diff) | |
| download | build_soong-4d67642cbdb062882cf9cc1226722da05d0e457b.tar.gz build_soong-4d67642cbdb062882cf9cc1226722da05d0e457b.tar.bz2 build_soong-4d67642cbdb062882cf9cc1226722da05d0e457b.zip | |
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
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/library.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/library.go b/cc/library.go index 53c9a580..5a7afe19 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) |