StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add $ORIGIN to rpath for host tests

Browse Source 
Allow loading test libraries installed into the test directory.

Test: builds
Change-Id: I15a462ebd41b99e9eb76b5be889ed3bd013732e0
This commit is contained in:
Colin Cross
2017-06-30 17:27:55 -07:00
parent 2ebc476646
commit bd75e1d0bd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/test.go
View File

@@ -175,11 +175,16 @@ func (test *testDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
} }
func (test *testDecorator) linkerInit(ctx BaseModuleContext, linker *baseLinker) { func (test *testDecorator) linkerInit(ctx BaseModuleContext, linker *baseLinker) {
// add ../../lib[64] to rpath so that out/host/linux-x86/nativetest/<test dir>/<test> can
// find out/host/linux-x86/lib[64]/library.so
runpath := "../../lib" runpath := "../../lib"
if ctx.toolchain().Is64Bit() { if ctx.toolchain().Is64Bit() {
runpath += "64" runpath += "64"
} }
linker.dynamicProperties.RunPaths = append(linker.dynamicProperties.RunPaths, runpath) linker.dynamicProperties.RunPaths = append(linker.dynamicProperties.RunPaths, runpath)
// add "" to rpath so that test binaries can find libraries in their own test directory
linker.dynamicProperties.RunPaths = append(linker.dynamicProperties.RunPaths, "")
} }
func (test *testDecorator) linkerProps() []interface{} { func (test *testDecorator) linkerProps() []interface{} {