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

Commit efb9bb40 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Default to not creating stubs for droiddoc" am: 703ea006 

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

Change-Id: Ie4894de78da697937283a1d06c5644376cb10b53
parents afd7abdf 703ea006

java/droiddoc.go

+6 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ type DroiddocProperties struct { 
	// the generated removed Dex API filename by Doclava.

	Removed_dex_api_filename *string



	// if set to false, don't allow droiddoc to generate stubs source files. Defaults to true.

	// if set to false, don't allow droiddoc to generate stubs source files. Defaults to false.

	Create_stubs *bool



	Check_api struct {
@@ -870,6 +870,10 @@ func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.Rule 
	}

}



func (d *Droiddoc) createStubs() bool {

	return BoolDefault(d.properties.Create_stubs, false)

}



func (d *Droiddoc) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, stubsDir android.WritablePath) {

	if apiCheckEnabled(ctx, d.properties.Check_api.Current, "current") ||

		apiCheckEnabled(ctx, d.properties.Check_api.Last_released, "last_released") ||
@@ -892,7 +896,7 @@ func (d *Droiddoc) stubsFlags(ctx android.ModuleContext, cmd *android.RuleBuilde 
		cmd.FlagWithOutput("-removedDexApi ", d.removedDexApiFile)

	}



	if BoolDefault(d.properties.Create_stubs, true) {

	if d.createStubs() {

		cmd.FlagWithArg("-stubs ", stubsDir.String())

	}

java/java_test.go

+7 −2
Original line number Diff line number Diff line
@@ -1109,8 +1109,13 @@ func TestDroiddoc(t *testing.T) { 
			"bar-doc/a.java": nil,

			"bar-doc/b.java": nil,

		})

	barDocModule := ctx.ModuleForTests("bar-doc", "android_common")

	barDoc := barDocModule.Rule("javadoc")

	notExpected := " -stubs "

	if strings.Contains(barDoc.RuleParams.Command, notExpected) {

		t.Errorf("bar-doc command contains flag %q to create stubs, but should not", notExpected)

	}



	barDoc := ctx.ModuleForTests("bar-doc", "android_common").Rule("javadoc")

	var javaSrcs []string

	for _, i := range barDoc.Inputs {

		javaSrcs = append(javaSrcs, i.Base())
@@ -1119,7 +1124,7 @@ func TestDroiddoc(t *testing.T) { 
		t.Errorf("inputs of bar-doc must be []string{\"a.java\"}, but was %#v.", javaSrcs)

	}



	aidl := ctx.ModuleForTests("bar-doc", "android_common").Rule("aidl")

	aidl := barDocModule.Rule("aidl")

	if g, w := barDoc.Implicits.Strings(), aidl.Output.String(); !inList(w, g) {

		t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g)

	}