diff options
| author | 2021-11-03 15:55:01 +0800 | |
|---|---|---|
| committer | 2021-11-05 12:06:15 +0800 | |
| commit | c44ba2a6f99d18f6b12e95a86d240a3d5a11ea00 (patch) | |
| tree | eca9f8bea836139bf2f872e26bd9ce6d8dd4a321 /java/jdeps.go | |
| parent | 9de51af72c2725953c344a249fb41c0cb93b71e2 (diff) | |
Dump deps for native and java to json files.
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
Diffstat (limited to 'java/jdeps.go')
| -rw-r--r-- | java/jdeps.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/java/jdeps.go b/java/jdeps.go index 0ab2e422b..eff9a3174 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -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) { |