diff --git a/android/module.go b/android/module.go index 06079cae9..cfb4505dc 100644 --- a/android/module.go +++ b/android/module.go @@ -234,6 +234,7 @@ type Module interface { Disable() Enabled() bool Target() Target + Owner() string InstallInData() bool InstallInTestcases() bool InstallInSanitizerDir() bool diff --git a/apex/androidmk.go b/apex/androidmk.go index 759523896..b4e5259c4 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -103,6 +103,9 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) } fmt.Fprintln(w, "LOCAL_MODULE :=", moduleName) + if fi.module != nil && fi.module.Owner() != "" { + fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", fi.module.Owner()) + } // /apex//{lib|framework|...} pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex", apexName, fi.installDir) if apexType == flattenedApex {