diff options
| author | 2020-06-12 04:08:28 +0000 | |
|---|---|---|
| committer | 2020-06-12 04:08:28 +0000 | |
| commit | fe25dc9f3b2bc148942a20fd338d3d764eff956e (patch) | |
| tree | 38a8d0c86a7652f28166e0660707805ad5e14d8f /sh/sh_binary.go | |
| parent | 6db2306c57789ec320d45346d9a16a4554e0d81a (diff) | |
| parent | 0c55445b72e80afcc2f028e1c676284935f7784e (diff) | |
Merge "Revert "Add module name to sh_test install path.""
Diffstat (limited to 'sh/sh_binary.go')
| -rw-r--r-- | sh/sh_binary.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index ae653fd30..7bb267da2 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -107,8 +107,6 @@ type ShTest struct { testProperties TestProperties - installDir android.InstallPath - data android.Paths testConfig android.Path } @@ -203,8 +201,8 @@ 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()) } - s.installDir = android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir), s.Name()) - s.installedFile = ctx.InstallExecutable(s.installDir, s.outputFilePath.Base(), s.outputFilePath) + installDir := android.PathForModuleInstall(ctx, testDir, proptools.String(s.properties.Sub_dir)) + s.installedFile = ctx.InstallExecutable(installDir, s.outputFilePath.Base(), s.outputFilePath) s.data = android.PathsForModuleSrc(ctx, s.testProperties.Data) @@ -232,7 +230,6 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { 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) |