diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-07-18 19:42:09 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-07-18 19:42:09 -0700 |
| commit | efac4a87ee8e0160c4b5f41326db4fa35066cf23 (patch) | |
| tree | 41fc6b7db92115ee4a1de4bd3ff9b28662073a56 /android/androidmk.go | |
| parent | 3c8ba15bdd3b50b7c9d765b5c17a49a33948db97 (diff) | |
| download | build_soong-efac4a87ee8e0160c4b5f41326db4fa35066cf23.tar.gz build_soong-efac4a87ee8e0160c4b5f41326db4fa35066cf23.tar.bz2 build_soong-efac4a87ee8e0160c4b5f41326db4fa35066cf23.zip | |
Switch `owner` to *string to disable concat
If owner is specified in a defaults module, we shouldn't concat that
with the owner specified in a module using that defaults module. A
string pointer will produce the correct behavior (overriding the default)
Bug: 37330627
Test: out/soong/Android-*.mk looks correct after this change
Change-Id: I64574e2ba81c11b042248d7a44702ec4534ee932
Diffstat (limited to 'android/androidmk.go')
| -rw-r--r-- | android/androidmk.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index b81cc2a6..dabefcca 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -246,8 +246,8 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b if amod.commonProperties.Vendor { fmt.Fprintln(w, "LOCAL_VENDOR_MODULE := true") } - if amod.commonProperties.Owner != "" { - fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", amod.commonProperties.Owner) + if amod.commonProperties.Owner != nil { + fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", *amod.commonProperties.Owner) } } |