diff options
| author | 2021-11-11 18:59:15 -0800 | |
|---|---|---|
| committer | 2021-12-15 15:22:53 -0800 | |
| commit | c68db4b305b9186d8d9b4e83b298a33fa810d06b (patch) | |
| tree | d8a61ff4d4694bedd12cbb3ef100f974b24e08e3 /sh/sh_binary.go | |
| parent | e23a32bdc5dc07bea8d602662b2b0020159a6742 (diff) | |
Remove InstallBypassMake and ToMakePath
InstallBypassMake and ToMakePath are obsolete, remove them.
Bug: 204136549
Test: m checkbuild
Change-Id: Ie5a6f7254b3d317ed6039e114ed6aec35e1ce273
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) |