commit d1fcc4a93dd1989091a03cbe8015b89c61dbbfe4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 11 03:59:42 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 11 03:59:42 2019 +0000
tree 8fb130a1c0b561360ea68416fa2660581a0ad369
parent a1738e2c00ab590f7bc3e7076518afcc5035c5cd
parent 939408aa221f13168b2fe9f033d7eb84e2d75de2

Merge "Add dependency to version script when linking stub libraries"

cc/llndk_library.go

diff --git a/cc/llndk_library.go b/cc/llndk_library.go
index 6cdf5c7..37f217e 100644
--- a/cc/llndk_library.go
+++ b/cc/llndk_library.go
@@ -134,6 +134,7 @@
 	if !Bool(stub.Properties.Unversioned) {
 		linkerScriptFlag := "-Wl,--version-script," + stub.versionScriptPath.String()
 		flags.LdFlags = append(flags.LdFlags, linkerScriptFlag)
+		flags.LdFlagsDeps = append(flags.LdFlagsDeps, stub.versionScriptPath)
 	}
 
 	if len(stub.Properties.Export_preprocessed_headers) > 0 {

cc/ndk_library.go

diff --git a/cc/ndk_library.go b/cc/ndk_library.go
index 44f773c..969cb3f 100644
--- a/cc/ndk_library.go
+++ b/cc/ndk_library.go
@@ -337,6 +337,7 @@
 	if useVersionScript {
 		linkerScriptFlag := "-Wl,--version-script," + stub.versionScriptPath.String()
 		flags.LdFlags = append(flags.LdFlags, linkerScriptFlag)
+		flags.LdFlagsDeps = append(flags.LdFlagsDeps, stub.versionScriptPath)
 	}
 
 	return stub.libraryDecorator.link(ctx, flags, deps, objs)

cc/vendor_public_library.go

diff --git a/cc/vendor_public_library.go b/cc/vendor_public_library.go
index 5738d25..f0de267 100644
--- a/cc/vendor_public_library.go
+++ b/cc/vendor_public_library.go
@@ -125,6 +125,7 @@
 	if !Bool(stub.Properties.Unversioned) {
 		linkerScriptFlag := "-Wl,--version-script," + stub.versionScriptPath.String()
 		flags.LdFlags = append(flags.LdFlags, linkerScriptFlag)
+		flags.LdFlagsDeps = append(flags.LdFlagsDeps, stub.versionScriptPath)
 	}
 	return stub.libraryDecorator.link(ctx, flags, deps, objs)
 }