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

Dump deps for native and java to json files.

Browse Source 
Abandon the use of SOONG_COLLECT_CC_DEPS and SOONG_COLLECT_JAVA_DEPS,
soong can generate module_bp_cc_deps.json and module_bp_java_deps.json
without passing any variables.

BUG: 204397180

Test: rm out/soong/module_bp*json
"m nothing" should see both json files were generated.

Change-Id: If30ad5dbabb6709f834134cbc9a513a9bdc9d9de
This commit is contained in:
Jim Tang
2021-11-03 15:55:01 +08:00
parent 9de51af72c
commit c44ba2a6f9
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) var _ android.SingletonMakeVarsProvider = (*ccdepsGeneratorSingleton)(nil)
const ( const (
// Environment variables used to control the behavior of this singleton. ccdepsJsonFileName = "module_bp_cc_deps.json"
envVariableCollectCCDeps = "SOONG_COLLECT_CC_DEPS" cClang = "clang"
ccdepsJsonFileName = "module_bp_cc_deps.json" cppClang = "clang++"
cClang = "clang"
cppClang = "clang++"
) )
type ccIdeInfo struct { type ccIdeInfo struct {
@@ -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{}

9
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. jdepsJsonFileName = "module_bp_java_deps.json"
envVariableCollectJavaDeps = "SOONG_COLLECT_JAVA_DEPS"
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) {