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

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

Change-Id: I3a9b537606b6c39d9d89a4e289aab29b44550a4a
This commit is contained in:
Treehugger Robot
2021-11-11 04:49:34 +00:00
committed by Automerger Merge Worker
parent 5f46e246aa 008d17612a
commit 17550eb4a0
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/ccdeps.go
View File

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

7
java/jdeps.go
View File

@@ -40,16 +40,11 @@ type jdepsGeneratorSingleton struct {
var _ android.SingletonMakeVarsProvider = (*jdepsGeneratorSingleton)(nil) var _ android.SingletonMakeVarsProvider = (*jdepsGeneratorSingleton)(nil)
const ( 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) { func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonContext) {
if !ctx.Config().IsEnvTrue(envVariableCollectJavaDeps) { // (b/204397180) Generate module_bp_java_deps.json by default.
return
}
moduleInfos := make(map[string]android.IdeInfo) moduleInfos := make(map[string]android.IdeInfo)
ctx.VisitAllModules(func(module android.Module) { ctx.VisitAllModules(func(module android.Module) {