diff options
| author | Anton Hansson <hansson@google.com> | 2020-06-30 19:08:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-30 19:08:05 +0000 |
| commit | ff1531e13b49792cb776c6d3374435d7fe4d7006 (patch) | |
| tree | afd0ea42b9f6fe7112d53ec0f5cde3ebb9838234 | |
| parent | 13b85a47924d24cfc82830b753333a9c1d3f6fb8 (diff) | |
| parent | 1ee62c03baabdc85c4b3f8c5edbcd8ce68ff95d4 (diff) | |
| download | build_soong-ff1531e13b49792cb776c6d3374435d7fe4d7006.tar.gz build_soong-ff1531e13b49792cb776c6d3374435d7fe4d7006.tar.bz2 build_soong-ff1531e13b49792cb776c6d3374435d7fe4d7006.zip | |
Merge "Propagate owner property for apex modules" into rvc-dev
| -rw-r--r-- | android/module.go | 1 | ||||
| -rw-r--r-- | apex/androidmk.go | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/android/module.go b/android/module.go index 5bccb79a..cd4baabb 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 cbff7f4f..884a4e81 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 { |