commit 1ee62c03baabdc85c4b3f8c5edbcd8ce68ff95d4
author Anton Hansson <hansson@google.com> Tue Jun 30 11:51:53 2020 +0100
committer Anton Hansson <hansson@google.com> Tue Jun 30 13:55:23 2020 +0000
tree bbbc5f9f719a0e4a9e090b3479e335cc725c004a
parent c4422106a7cf4731e27d664646bc0d57ad3f37fa

Propagate owner property for apex modules

Bug: 160165426
Test: lunch aosp_taimen && m nothing
Change-Id: I1d274ea376c58ff44d69ef5440c919b67079ae4a

apex/androidmk.go

diff --git a/apex/androidmk.go b/apex/androidmk.go
index cbff7f4..884a4e8 100644
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@@ -108,6 +108,9 @@
 			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 {