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

Merge "Dump deps for native and java to json files." am: 008d17612a am: 17550eb4a0 am: 1dde18a42c am: 4c9cb33365

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

Change-Id: I1f6706feb7a0bb17f286bb34b2f4eec10e7f2dd3
This commit is contained in:
Treehugger Robot
2021-11-11 05:38:52 +00:00
committed by Automerger Merge Worker
parent 079e3f1fb1 4c9cb33365
commit 43d724ab16
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/ccdeps.go
View File

@@ -44,11 +44,9 @@ type ccdepsGeneratorSingleton struct {
var _ android.SingletonMakeVarsProvider = (*ccdepsGeneratorSingleton)(nil)
const (
// Environment variables used to control the behavior of this singleton.
envVariableCollectCCDeps = "SOONG_COLLECT_CC_DEPS"
ccdepsJsonFileName = "module_bp_cc_deps.json"
cClang = "clang"
cppClang = "clang++"
ccdepsJsonFileName = "module_bp_cc_deps.json"
cClang = "clang"
cppClang = "clang++"
)
type ccIdeInfo struct {
@@ -83,10 +81,7 @@ type ccDeps struct {
}
func (c *ccdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonContext) {
if !ctx.Config().IsEnvTrue(envVariableCollectCCDeps) {
return
}
// (b/204397180) Generate module_bp_cc_deps.json by default.
moduleDeps := ccDeps{}
moduleInfos := map[string]ccIdeInfo{}

9
java/jdeps.go
View File

@@ -40,16 +40,11 @@ type jdepsGeneratorSingleton struct {
var _ android.SingletonMakeVarsProvider = (*jdepsGeneratorSingleton)(nil)
const (
// Environment variables used to modify behavior of this singleton.
envVariableCollectJavaDeps = "SOONG_COLLECT_JAVA_DEPS"
jdepsJsonFileName = "module_bp_java_deps.json"
jdepsJsonFileName = "module_bp_java_deps.json"
)
func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonContext) {
if !ctx.Config().IsEnvTrue(envVariableCollectJavaDeps) {
return
}
// (b/204397180) Generate module_bp_java_deps.json by default.
moduleInfos := make(map[string]android.IdeInfo)
ctx.VisitAllModules(func(module android.Module) {