summaryrefslogtreecommitdiff
path: root/apex/androidmk.go
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2020-09-09 20:21:02 -0700
committer Xin Li <delphij@google.com> 2020-09-09 20:21:02 -0700
commit429c23c1fa71b4f542fadece635801c6edb1aa50 (patch)
tree09d185449732c712f40c2e204a093d044dc8570f /apex/androidmk.go
parent4f35976c87c24f4584ff8f86298c63c75f063be4 (diff)
parentfbd7372401e29a5f9b5e3f0a9f959455f4e77168 (diff)
Merge Android R
Bug: 168057903 Merged-In: I9d5d0da0f409bd6b131f7e0f6363be061d3045c1 Change-Id: Ie7feaf6a3d0787c750de17540969b876a4306b0a
Diffstat (limited to 'apex/androidmk.go')
-rw-r--r--apex/androidmk.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/apex/androidmk.go b/apex/androidmk.go
index 5c6d6ccfe..af2ec3d2a 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)
var modulePath string