diff options
Diffstat (limited to 'sh/sh_binary.go')
| -rw-r--r-- | sh/sh_binary.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 2d98e8be0..e1df8ac59 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -166,10 +166,6 @@ type ShBinary struct { var _ android.HostToolProvider = (*ShBinary)(nil) -func (s *ShBinary) InstallBypassMake() bool { - return true -} - type ShTest struct { ShBinary @@ -435,7 +431,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { s.customAndroidMkEntries(entries) - entries.SetPath("LOCAL_MODULE_PATH", s.installDir.ToMakePath()) + entries.SetPath("LOCAL_MODULE_PATH", s.installDir) entries.AddCompatibilityTestSuites(s.testProperties.Test_suites...) if s.testConfig != nil { entries.SetPath("LOCAL_FULL_TEST_CONFIG", s.testConfig) |