Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43dd94cf authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Support owner property"

parents ed1665dc 55708f3f

android/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b 
		if amod.commonProperties.Proprietary {

			fmt.Fprintln(w, "LOCAL_PROPRIETARY_MODULE := true")

		}

		if amod.commonProperties.Owner != "" {

			fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", amod.commonProperties.Owner)

		}

	}



	if host {

android/module.go

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ type commonProperties struct { 
	// whether this is a proprietary vendor module, and should be installed into /vendor

	Proprietary bool



	// vendor who owns this module

	Owner string



	// *.logtags files, to combine together in order to generate the /system/etc/event-log-tags

	// file

	Logtags []string

androidmk/cmd/androidmk/android.go

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ func init() { 
			"LOCAL_MODULE_RELATIVE_PATH": "relative_install_path",

			"LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type",

			"LOCAL_HEADER_LIBRARIES":     "header_libs",

			"LOCAL_MODULE_OWNER":         "owner",

		})

	addStandardProperties(bpparser.ListType,

		map[string]string{