Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 008d1761 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Dump deps for native and java to json files."

parents 2a8105d1 c44ba2a6

cc/ccdeps.go

+4 −9
Original line number Original line Diff line number Diff line
@@ -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{}

java/jdeps.go

+2 −7
Original line number Original line Diff line number Diff line
@@ -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) {