Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1fcc4a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents a1738e2c 939408aa

cc/llndk_library.go

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ func (stub *llndkStubDecorator) link(ctx ModuleContext, flags Flags, deps PathDe 
	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

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ func (stub *stubDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps, 
	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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ func (stub *vendorPublicLibraryStubDecorator) link(ctx ModuleContext, flags Flag 
	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)

}