Merge "Add soong cc and java deps to general-tests dist" (203a3f2f) · Commits · e / os / android_build_soong

cc/ccdeps.go

+18 −0

Original line number	Diff line number	Diff line
		@@ -38,8 +38,11 @@ func ccDepsGeneratorSingleton() android.Singleton {
		}

		type ccdepsGeneratorSingleton struct {
		outputPath android.Path
		}

		var _ android.SingletonMakeVarsProvider = (*ccdepsGeneratorSingleton)(nil)

		const (
		// Environment variables used to control the behavior of this singleton.
		envVariableCollectCCDeps = "SOONG_COLLECT_CC_DEPS"
		@@ -110,6 +113,21 @@ func (c *ccdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCon
		if err != nil {
		ctx.Errorf(err.Error())
		}
		c.outputPath = ccfpath

		// This is necessary to satisfy the dangling rules check as this file is written by Soong rather than a rule.
		ctx.Build(pctx, android.BuildParams{
		Rule: android.Touch,
		Output: ccfpath,
		})
		}

		func (c *ccdepsGeneratorSingleton) MakeVars(ctx android.MakeVarsContext) {
		if c.outputPath == nil {
		return
		}

		ctx.DistForGoal("general-tests", c.outputPath)
		}

		func parseCompilerCCParameters(ctx android.SingletonContext, params []string) ccParameters {

+18 −0

Original line number	Diff line number	Diff line
		@@ -34,8 +34,11 @@ func jDepsGeneratorSingleton() android.Singleton {
		}

		type jdepsGeneratorSingleton struct {
		outputPath android.Path
		}

		var _ android.SingletonMakeVarsProvider = (*jdepsGeneratorSingleton)(nil)

		const (
		// Environment variables used to modify behavior of this singleton.
		envVariableCollectJavaDeps = "SOONG_COLLECT_JAVA_DEPS"
		@@ -97,6 +100,21 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
		if err != nil {
		ctx.Errorf(err.Error())
		}
		j.outputPath = jfpath

		// This is necessary to satisfy the dangling rules check as this file is written by Soong rather than a rule.
		ctx.Build(pctx, android.BuildParams{
		Rule: android.Touch,
		Output: jfpath,
		})
		}

		func (j *jdepsGeneratorSingleton) MakeVars(ctx android.MakeVarsContext) {
		if j.outputPath == nil {
		return
		}

		ctx.DistForGoal("general-tests", j.outputPath)
		}

		func createJsonFile(moduleInfos map[string]android.IdeInfo, jfpath android.WritablePath) error {