diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-24 05:53:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-24 05:53:25 +0000 |
commit | bbfd5ab606a0e7077f9b1fbc06222a55d1e3b517 (patch) | |
tree | 9eb743bf5303c9711478700395dfb35269db6e6a /sh | |
parent | 7ebe464748d10343bcb5ae3a9a153fcb1fc27e52 (diff) | |
parent | ea6666fba98c8d49789059ba32feae29621deb3a (diff) | |
download | soong-bbfd5ab606a0e7077f9b1fbc06222a55d1e3b517.tar.gz |
Merge "Move bazel.Properties to a BazelModuleBase"
Diffstat (limited to 'sh')
-rw-r--r-- | sh/sh_binary.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 3a5c7de99..031cd4717 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -84,9 +84,6 @@ type shBinaryProperties struct { // Make this module available when building for recovery. Recovery_available *bool - - // Properties for Bazel migration purposes. - bazel.Properties } type TestProperties struct { @@ -132,6 +129,7 @@ type TestProperties struct { type ShBinary struct { android.ModuleBase + android.BazelModuleBase properties shBinaryProperties @@ -427,6 +425,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { func InitShBinaryModule(s *ShBinary) { s.AddProperties(&s.properties) + android.InitBazelModule(s) } // sh_binary is for a shell script or batch file to be installed as an @@ -504,7 +503,7 @@ func BazelShBinaryFactory() android.Module { func ShBinaryBp2Build(ctx android.TopDownMutatorContext) { m, ok := ctx.Module().(*ShBinary) - if !ok || !m.properties.Bazel_module.Bp2build_available { + if !ok || !m.ConvertWithBp2build() { return } |