openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Support python binaries in sh_test_host"

This commit is contained in:
Anton Hansson 2021-01-08 15:17:27 +00:00 committed by Gerrit Code Review
parent c7ca43ec92 2f6422cb1e
commit 7241119d8d
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sh/sh_binary.go
View File

@ -345,15 +345,8 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
depTag := ctx.OtherModuleDependencyTag(dep) depTag := ctx.OtherModuleDependencyTag(dep)
switch depTag { switch depTag {
case shTestDataBinsTag, shTestDataDeviceBinsTag: case shTestDataBinsTag, shTestDataDeviceBinsTag:
if cc, isCc := dep.(*cc.Module); isCc { path := android.OutputFileForModule(ctx, dep, "")
s.addToDataModules(ctx, cc.OutputFile().Path().Base(), cc.OutputFile().Path()) s.addToDataModules(ctx, path.Base(), path)
return
}
property := "data_bins"
if depTag == shTestDataDeviceBinsTag {
property = "data_device_bins"
}
ctx.PropertyErrorf(property, "%q of type %q is not supported", dep.Name(), ctx.OtherModuleType(dep))
case shTestDataLibsTag, shTestDataDeviceLibsTag: case shTestDataLibsTag, shTestDataDeviceLibsTag:
if cc, isCc := dep.(*cc.Module); isCc { if cc, isCc := dep.(*cc.Module); isCc {
// Copy to an intermediate output directory to append "lib[64]" to the path, // Copy to an intermediate output directory to append "lib[64]" to the path,