diff options
| author | 2020-08-29 01:17:45 -0700 | |
|---|---|---|
| committer | 2020-08-29 01:17:45 -0700 | |
| commit | 65cb5c69ea5c6134b8c6bad09242f7d7ca52d9e8 (patch) | |
| tree | f7c3529e7aff1c8cb4d8fa55ec6f6bdeae5821d3 /apex/androidmk.go | |
| parent | bca691b377e683becf4098683a91091cfc10c9f5 (diff) | |
| parent | d786b6bffece20ecff5c387a41ba5d82ded29759 (diff) | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ifca7b65f4e27bf14cdc30f72f790b0de90130bae
Change-Id: I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
Diffstat (limited to 'apex/androidmk.go')
| -rw-r--r-- | apex/androidmk.go | 3 |
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 |