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

Merge changes from topic "move_allowed_deps_txt" am: 2b077baa5e am: 0ee372ad6f

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

Change-Id: Ia9e9f9458aaed90d994e6d4454c0c046ed75082a
This commit is contained in:
satayev
2021-03-22 12:01:22 +00:00
committed by Automerger Merge Worker
parent e23b216079 0ee372ad6f
commit 3c5d96925f
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apex/apex_singleton.go
View File

@@ -81,25 +81,35 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex
} }
}) })
allowedDeps := android.ExistentPathForSource(ctx, "packages/modules/common/build/allowed_deps.txt").Path() allowedDepsSource := android.ExistentPathForSource(ctx, "packages/modules/common/build/allowed_deps.txt")
newAllowedDeps := android.PathForOutput(ctx, "apex", "depsinfo", "new-allowed-deps.txt") newAllowedDeps := android.PathForOutput(ctx, "apex", "depsinfo", "new-allowed-deps.txt")
ctx.Build(pctx, android.BuildParams{
Rule: generateApexDepsInfoFilesRule,
Inputs: append(updatableFlatLists, allowedDeps),
Output: newAllowedDeps,
})
s.allowedApexDepsInfoCheckResult = android.PathForOutput(ctx, newAllowedDeps.Rel()+".check") s.allowedApexDepsInfoCheckResult = android.PathForOutput(ctx, newAllowedDeps.Rel()+".check")
ctx.Build(pctx, android.BuildParams{
Rule: diffAllowedApexDepsInfoRule, if !allowedDepsSource.Valid() {
Input: newAllowedDeps, // Unbundled projects may not have packages/modules/common/ checked out; ignore those.
Output: s.allowedApexDepsInfoCheckResult, ctx.Build(pctx, android.BuildParams{
Args: map[string]string{ Rule: android.Touch,
"allowed_deps": allowedDeps.String(), Output: s.allowedApexDepsInfoCheckResult,
"new_allowed_deps": newAllowedDeps.String(), })
}, } else {
}) allowedDeps := allowedDepsSource.Path()
ctx.Build(pctx, android.BuildParams{
Rule: generateApexDepsInfoFilesRule,
Inputs: append(updatableFlatLists, allowedDeps),
Output: newAllowedDeps,
})
ctx.Build(pctx, android.BuildParams{
Rule: diffAllowedApexDepsInfoRule,
Input: newAllowedDeps,
Output: s.allowedApexDepsInfoCheckResult,
Args: map[string]string{
"allowed_deps": allowedDeps.String(),
"new_allowed_deps": newAllowedDeps.String(),
},
})
}
ctx.Phony("apex-allowed-deps-check", s.allowedApexDepsInfoCheckResult) ctx.Phony("apex-allowed-deps-check", s.allowedApexDepsInfoCheckResult)
} }