openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Propagate owner property for apex modules" into rvc-dev am: ff1531e13b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12034797

Change-Id: I478d0442eee9e1eee74a853d51f21f797f2aeec0
This commit is contained in:
Anton Hansson 2020-06-30 19:26:13 +00:00 committed by Automerger Merge Worker
parent 7df01cc05a ff1531e13b
commit 62783652ac
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/module.go
View File

@ -234,6 +234,7 @@ type Module interface {
Disable() Disable()
Enabled() bool Enabled() bool
Target() Target Target() Target
Owner() string
InstallInData() bool InstallInData() bool
InstallInTestcases() bool InstallInTestcases() bool
InstallInSanitizerDir() bool InstallInSanitizerDir() bool

3
apex/androidmk.go
View File

@ -103,6 +103,9 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
} }
fmt.Fprintln(w, "LOCAL_MODULE :=", moduleName) 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|...} // /apex/<apex_name>/{lib|framework|...}
pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex", apexName, fi.installDir) pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex", apexName, fi.installDir)
if apexType == flattenedApex { if apexType == flattenedApex {