diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-07-19 04:36:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-19 04:36:08 +0000 |
| commit | e5daf569ec63fc8c9a6c01762d01237cf72587c6 (patch) | |
| tree | d74b2ea59d4a14466ab21f15af6d7b4cb1142e3c | |
| parent | aea659dcf140201a10e0acb873849797d2aaa7bc (diff) | |
| parent | 737623108df4f6acd74a36bf5c679ee8758f5c75 (diff) | |
| download | build_soong-e5daf569ec63fc8c9a6c01762d01237cf72587c6.tar.gz build_soong-e5daf569ec63fc8c9a6c01762d01237cf72587c6.tar.bz2 build_soong-e5daf569ec63fc8c9a6c01762d01237cf72587c6.zip | |
Merge "Switch `owner` to *string to disable concat" am: 1651953ca5
am: 737623108d
Change-Id: I1837f8a25761ac4308888db7c29da386e8f39fbc
| -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 |