StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use BaseModuleName() + SubName as apexFile.moduleName" am: 060dc0bea2 am: bc2647f97b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371679

Change-Id: I7413e68bdac18091ee1146e6536e97bb55df1ad5
This commit is contained in:
Yo Chiang
2020-07-28 11:46:55 +00:00
committed by Automerger Merge Worker
parent 9ff5a66f03 bc2647f97b
commit cb7fa1a353
3 changed files with 94 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/androidmk.go
View File

@@ -82,9 +82,9 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
var moduleName string
if linkToSystemLib {
moduleName = fi.moduleName
moduleName = fi.androidMkModuleName
} else {
moduleName = fi.moduleName + "." + apexBundleName + a.suffix
moduleName = fi.androidMkModuleName + "." + apexBundleName + a.suffix
}
if !android.InList(moduleName, moduleNames) {
@@ -253,9 +253,9 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
}
// m <module_name> will build <module_name>.<apex_name> as well.
if fi.moduleName != moduleName && a.primaryApexType {
fmt.Fprintln(w, ".PHONY: "+fi.moduleName)
fmt.Fprintln(w, fi.moduleName+": "+moduleName)
if fi.androidMkModuleName != moduleName && a.primaryApexType {
fmt.Fprintf(w, ".PHONY: %s\n", fi.androidMkModuleName)
fmt.Fprintf(w, "%s: %s\n", fi.androidMkModuleName, moduleName)
}
}
return moduleNames