diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-07-19 04:28:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-19 04:28:31 +0000 |
| commit | 1651953ca53fceb425bd688eb31163bcca4f7313 (patch) | |
| tree | 55782d67d98d0ebbba91a0d8d72d40fcc18f203a | |
| parent | 57b314dabaf6b5e979cf1639ea24ad8d2d34ff7c (diff) | |
| parent | efac4a87ee8e0160c4b5f41326db4fa35066cf23 (diff) | |
| download | build_soong-1651953ca53fceb425bd688eb31163bcca4f7313.tar.gz build_soong-1651953ca53fceb425bd688eb31163bcca4f7313.tar.bz2 build_soong-1651953ca53fceb425bd688eb31163bcca4f7313.zip | |
Merge "Switch `owner` to *string to disable concat"
| -rw-r--r-- | android/androidmk.go | 4 | ||||
| -rw-r--r-- | android/module.go | 2 |
2 files changed, 3 insertions, 3 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) } } diff --git a/android/module.go b/android/module.go index fcb5aeef..3a3d1735 100644 --- a/android/module.go +++ b/android/module.go @@ -147,7 +147,7 @@ type commonProperties struct { Proprietary bool // vendor who owns this module - Owner string + Owner *string // whether this module is device specific and should be installed into /vendor Vendor bool |