aboutsummaryrefslogtreecommitdiffstats
path: root/cc/builder.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-07-06 17:48:31 -0700
committerColin Cross <ccross@android.com>2015-07-07 10:34:19 -0700
commitaee540a43938fb3a4bfd04fd6ba54d9aea9a4c20 (patch)
treedf75ef49f5a8cd2c7744bc45eb210744fc190c81 /cc/builder.go
parent2617316f6c5fedfdf699128783797885c8af0e04 (diff)
downloadbuild_soong-aee540a43938fb3a4bfd04fd6ba54d9aea9a4c20.tar.gz
build_soong-aee540a43938fb3a4bfd04fd6ba54d9aea9a4c20.tar.bz2
build_soong-aee540a43938fb3a4bfd04fd6ba54d9aea9a4c20.zip
Add version_script property
Add version_script property to cc_library to pass a file to the linker with --version-script. Change-Id: Ieefb04e15c8dfa72c2eb63b4349f8860222662b2
Diffstat (limited to 'cc/builder.go')
-rw-r--r--cc/builder.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/builder.go b/cc/builder.go
index ab0e40c5..e35cebb4 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -277,7 +277,7 @@ func TransformDarwinObjToStaticLib(ctx common.AndroidModuleContext, objFiles []s
// Generate a rule for compiling multiple .o files, plus static libraries, whole static libraries,
// and shared libraires, to a shared library (.so) or dynamic executable
func TransformObjToDynamicBinary(ctx common.AndroidModuleContext,
- objFiles, sharedLibs, staticLibs, lateStaticLibs, wholeStaticLibs []string,
+ objFiles, sharedLibs, staticLibs, lateStaticLibs, wholeStaticLibs, deps []string,
crtBegin, crtEnd string, groupLate bool, flags builderFlags, outputFile string) {
var ldCmd string
@@ -323,7 +323,7 @@ func TransformObjToDynamicBinary(ctx common.AndroidModuleContext,
libFlagsList = append(libFlagsList, "-Wl,--end-group")
}
- deps := []string{ldCmd}
+ deps = append(deps, ldCmd)
deps = append(deps, sharedLibs...)
deps = append(deps, staticLibs...)
deps = append(deps, lateStaticLibs...)