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

Merge "Support owner property"

Browse Source
This commit is contained in:
Colin Cross
2017-03-20 22:34:54 +00:00
committed by Gerrit Code Review
parent ed1665dc8a 55708f3fb3
commit 43dd94cf66
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/androidmk.go
View File

@@ -232,6 +232,9 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
if amod.commonProperties.Proprietary { if amod.commonProperties.Proprietary {
fmt.Fprintln(w, "LOCAL_PROPRIETARY_MODULE := true") fmt.Fprintln(w, "LOCAL_PROPRIETARY_MODULE := true")
} }
if amod.commonProperties.Owner != "" {
fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", amod.commonProperties.Owner)
}
} }
if host { if host {

3
android/module.go
View File

@@ -137,6 +137,9 @@ type commonProperties struct {
// whether this is a proprietary vendor module, and should be installed into /vendor // whether this is a proprietary vendor module, and should be installed into /vendor
Proprietary bool Proprietary bool
// vendor who owns this module
Owner string
// *.logtags files, to combine together in order to generate the /system/etc/event-log-tags // *.logtags files, to combine together in order to generate the /system/etc/event-log-tags
// file // file
Logtags []string Logtags []string

1
androidmk/cmd/androidmk/android.go
View File

@@ -68,6 +68,7 @@ func init() {
"LOCAL_MODULE_RELATIVE_PATH": "relative_install_path", "LOCAL_MODULE_RELATIVE_PATH": "relative_install_path",
"LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type", "LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type",
"LOCAL_HEADER_LIBRARIES": "header_libs", "LOCAL_HEADER_LIBRARIES": "header_libs",
"LOCAL_MODULE_OWNER": "owner",
}) })
addStandardProperties(bpparser.ListType, addStandardProperties(bpparser.ListType,
map[string]string{ map[string]string{