diff options
| author | 2020-07-13 21:16:39 +0000 | |
|---|---|---|
| committer | 2020-07-13 21:16:39 +0000 | |
| commit | fd0111b26a34e75754018b1e28bc700bbf51c7cf (patch) | |
| tree | eea5476bd3353c4525a22f39cce89434b8d3cffd /java/java_test.go | |
| parent | 401b8ec527f66747bb410fe0c559acb25bbf12ef (diff) | |
| parent | 95393f8df12b342bfdcfe67a533ed75878e6d55d (diff) | |
Merge "Add array type property flags, equivalent to args" am: aeaffeb710 am: 95393f8df1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356166
Change-Id: Ia322c48a1f213998a70c6d0b8c07df67342b7eec
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index fb003619f..db3f18740 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1097,7 +1097,7 @@ func TestDroiddoc(t *testing.T) { ], proofread_file: "libcore-proofread.txt", todo_file: "libcore-docs-todo.html", - args: "-offlinemode -title \"libcore\"", + flags: ["-offlinemode -title \"libcore\""], } `, map[string][]byte{ @@ -1124,6 +1124,42 @@ func TestDroiddoc(t *testing.T) { } } +func TestDroiddocArgsAndFlagsCausesError(t *testing.T) { + testJavaError(t, "flags is set. Cannot set args", ` + droiddoc_exported_dir { + name: "droiddoc-templates-sdk", + path: ".", + } + filegroup { + name: "bar-doc-aidl-srcs", + srcs: ["bar-doc/IBar.aidl"], + path: "bar-doc", + } + droiddoc { + name: "bar-doc", + srcs: [ + "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", + ], + knowntags: [ + "bar-doc/known_oj_tags.txt", + ], + proofread_file: "libcore-proofread.txt", + todo_file: "libcore-docs-todo.html", + flags: ["-offlinemode -title \"libcore\""], + args: "-offlinemode -title \"libcore\"", + } + `) +} + func TestDroidstubsWithSystemModules(t *testing.T) { ctx, _ := testJava(t, ` droidstubs { |