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 "Make apex modules support tagged dists"

This commit is contained in:
Anton Hansson 2020-11-12 08:30:55 +00:00 committed by Gerrit Code Review
parent c0ea1701cb 82d502a7b2
commit fabdd28fdb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apex/androidmk.go
View File

@ -307,6 +307,7 @@ func (a *apexBundle) writeRequiredModules(w io.Writer) {
func (a *apexBundle) androidMkForType() android.AndroidMkData { func (a *apexBundle) androidMkForType() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
DistFiles: a.distFiles,
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
moduleNames := []string{} moduleNames := []string{}
apexType := a.properties.ApexType apexType := a.properties.ApexType
@ -391,6 +392,9 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData {
fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n",
goal, a.installedFilesFile.String(), distFile) goal, a.installedFilesFile.String(), distFile)
} }
for _, dist := range data.Entries.GetDistForGoals(a) {
fmt.Fprintf(w, dist)
}
} }
}} }}
} }

4
apex/apex.go
View File

@ -1477,6 +1477,8 @@ type apexBundle struct {
lintReports android.Paths lintReports android.Paths
payloadFsType fsType payloadFsType fsType
distFiles android.TaggedDistFiles
} }
func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
@ -2522,6 +2524,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.buildApexDependencyInfo(ctx) a.buildApexDependencyInfo(ctx)
a.buildLintReports(ctx) a.buildLintReports(ctx)
a.distFiles = a.GenerateTaggedDistFiles(ctx)
} }
// Enforce that Java deps of the apex are using stable SDKs to compile // Enforce that Java deps of the apex are using stable SDKs to compile