diff options
Diffstat (limited to 'sh/sh_binary.go')
| -rw-r--r-- | sh/sh_binary.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 7bb267da2..f28b2b685 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -107,6 +107,8 @@ type ShTest struct { testProperties TestProperties + installDir android.InstallPath + data android.Paths testConfig android.Path } @@ -176,13 +178,13 @@ func (s *ShBinary) AndroidMkEntries() []android.AndroidMkEntries { ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(entries *android.AndroidMkEntries) { s.customAndroidMkEntries(entries) + entries.SetString("LOCAL_MODULE_RELATIVE_PATH", proptools.String(s.properties.Sub_dir)) }, }, }} } func (s *ShBinary) customAndroidMkEntries(entries *android.AndroidMkEntries) { - entries.SetString("LOCAL_MODULE_RELATIVE_PATH", proptools.String(s.properties.Sub_dir)) entries.SetString("LOCAL_MODULE_SUFFIX", "") entries.SetString("LOCAL_MODULE_STEM", s.outputFilePath.Rel()) if len(s.properties.Symlinks) > 0 { @@ -201,8 +203,14 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { } else if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) { testDir = filepath.Join(testDir, ctx.Arch().ArchType.String()) } - installDir := android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir)) - s.installedFile = ctx.InstallExecutable(installDir, s.outputFilePath.Base(), s.outputFilePath) + if s.SubDir() != "" { + // Don't add the module name to the installation path if sub_dir is specified for backward + // compatibility. + s.installDir = android.PathForModuleInstall(ctx, testDir, s.SubDir()) + } else { + s.installDir = android.PathForModuleInstall(ctx, testDir, s.Name()) + } + s.installedFile = ctx.InstallExecutable(s.installDir, s.outputFilePath.Base(), s.outputFilePath) s.data = android.PathsForModuleSrc(ctx, s.testProperties.Data) @@ -229,7 +237,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(entries *android.AndroidMkEntries) { s.customAndroidMkEntries(entries) - + entries.SetPath("LOCAL_MODULE_PATH", s.installDir.ToMakePath()) entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", s.testProperties.Test_suites...) if s.testConfig != nil { entries.SetPath("LOCAL_FULL_TEST_CONFIG", s.testConfig) |