StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch owner to *string to disable concat"

Browse Source
This commit is contained in:
Treehugger Robot
2017-07-19 04:28:31 +00:00
committed by Gerrit Code Review
parent 57b314daba efac4a87ee
commit 1651953ca5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/androidmk.go
View File

@@ -246,8 +246,8 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
if amod.commonProperties.Vendor { if amod.commonProperties.Vendor {
fmt.Fprintln(w, "LOCAL_VENDOR_MODULE := true") fmt.Fprintln(w, "LOCAL_VENDOR_MODULE := true")
} }
if amod.commonProperties.Owner != "" { if amod.commonProperties.Owner != nil {
fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", amod.commonProperties.Owner) fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", *amod.commonProperties.Owner)
} }
} }

2
android/module.go
View File

@@ -147,7 +147,7 @@ type commonProperties struct {
Proprietary bool Proprietary bool
// vendor who owns this module // vendor who owns this module
Owner string Owner *string
// whether this module is device specific and should be installed into /vendor // whether this module is device specific and should be installed into /vendor
Vendor bool Vendor bool