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

Revert "Remove create_stubs and checkapi from droiddoc"

Browse Source 
This reverts commit 3a55c91f9d.

Reason for revert: build failed. Guess this is the cause but needs to confirm. Creating a revert per instructions

Change-Id: I30f1c8cd63e5ab84dba5d21ed354a42695c24ec4
This commit is contained in:
Steve Kim
2020-09-01 17:58:01 +00:00
parent 3a55c91f9d
commit 3666c7023f
3 changed files with 260 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
java/java_test.go
View File

@@ -1082,26 +1082,16 @@ func TestDroiddoc(t *testing.T) {
srcs: ["bar-doc/IBar.aidl"],
path: "bar-doc",
}
droidstubs {
name: "bar-stubs",
srcs: [
"bar-doc/a.java",
],
exclude_srcs: [
"bar-doc/b.java"
],
api_levels_annotations_dirs: [
"droiddoc-templates-sdk",
],
api_levels_annotations_enabled: true,
}
droiddoc {
name: "bar-doc",
srcs: [
":bar-stubs",
"bar-doc/a.java",
"bar-doc/IFoo.aidl",
":bar-doc-aidl-srcs",
],
exclude_srcs: [
"bar-doc/b.java"
],
custom_template: "droiddoc-templates-sdk",
hdf: [
"android.whichdoc offline",
@@ -1118,29 +1108,23 @@ func TestDroiddoc(t *testing.T) {
"bar-doc/a.java": nil,
"bar-doc/b.java": nil,
})
barStubs := ctx.ModuleForTests("bar-stubs", "android_common")
barStubsOutputs, err := barStubs.Module().(*Droidstubs).OutputFiles("")
if err != nil {
t.Errorf("Unexpected error %q retrieving \"bar-stubs\" output file", err)
}
if len(barStubsOutputs) != 1 {
t.Errorf("Expected one output from \"bar-stubs\" got %s", barStubsOutputs)
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)
}
barStubsOutput := barStubsOutputs[0]
barDoc := ctx.ModuleForTests("bar-doc", "android_common")
javaDoc := barDoc.Rule("javadoc")
if g, w := javaDoc.Implicits.Strings(), barStubsOutput.String(); !inList(w, g) {
t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g)
var javaSrcs []string
for _, i := range barDoc.Inputs {
javaSrcs = append(javaSrcs, i.Base())
}
if len(javaSrcs) != 1 || javaSrcs[0] != "a.java" {
t.Errorf("inputs of bar-doc must be []string{\"a.java\"}, but was %#v.", javaSrcs)
}
expected := "-sourcepath " + buildDir + "/.intermediates/bar-doc/android_common/srcjars "
if !strings.Contains(javaDoc.RuleParams.Command, expected) {
t.Errorf("bar-doc command does not contain flag %q, but should\n%q", expected, javaDoc.RuleParams.Command)
}
aidl := barDoc.Rule("aidl")
if g, w := javaDoc.Implicits.Strings(), aidl.Output.String(); !inList(w, g) {
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)
}
@@ -1160,26 +1144,16 @@ func TestDroiddocArgsAndFlagsCausesError(t *testing.T) {
srcs: ["bar-doc/IBar.aidl"],
path: "bar-doc",
}
droidstubs {
name: "bar-stubs",
srcs: [
"bar-doc/a.java",
],
exclude_srcs: [
"bar-doc/b.java"
],
api_levels_annotations_dirs: [
"droiddoc-templates-sdk",
],
api_levels_annotations_enabled: true,
}
droiddoc {
name: "bar-doc",
srcs: [
":bar-stubs",
"bar-doc/a.java",
"bar-doc/IFoo.aidl",
":bar-doc-aidl-srcs",
],
exclude_srcs: [
"bar-doc/b.java"
],
custom_template: "droiddoc-templates-sdk",
hdf: [
"android.whichdoc offline",