From 1ee62c03baabdc85c4b3f8c5edbcd8ce68ff95d4 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 30 Jun 2020 11:51:53 +0100
Subject: [PATCH] Propagate owner property for apex modules

Bug: 160165426
Test: lunch aosp_taimen && m nothing
Change-Id: I1d274ea376c58ff44d69ef5440c919b67079ae4a
---
 android/module.go | 1 +
 apex/androidmk.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/android/module.go b/android/module.go
index 5bccb79aa..cd4baabb5 100644
--- a/android/module.go
+++ b/android/module.go
@@ -221,6 +221,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 cbff7f4f4..884a4e818 100644
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@@ -108,6 +108,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/<apex_name>/{lib|framework|...}
 		pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex", apexName, fi.installDir)
 		if apexType == flattenedApex {