diff options
| author | Andreas Gampe <agampe@google.com> | 2018-01-22 21:27:21 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2018-01-23 20:30:01 -0800 |
| commit | f3e5b558e7a9d21994ea28cbb6dda77c2fb88d5f (patch) | |
| tree | 3c01f53318fcd850b6d925bf40ea30630f03b7b4 /androidmk | |
| parent | 312ccb974f953bc80867b4e32ddcd13ac9f9904d (diff) | |
| download | build_soong-f3e5b558e7a9d21994ea28cbb6dda77c2fb88d5f.tar.gz build_soong-f3e5b558e7a9d21994ea28cbb6dda77c2fb88d5f.tar.bz2 build_soong-f3e5b558e7a9d21994ea28cbb6dda77c2fb88d5f.zip | |
Soong: support Errorprone javacflags
Add support for an errorprone block in Java modules that accepts
additional javacflags for the errorprone build.
Sample:
errorprone: {
javacflags: ["-Xep:EqualsNaN:WARN"],
},
Bug: 72004718
Test: m RUN_ERROR_PRONE=true
Test: manual - add block with ERROR to a project
Test: androidmk_test
Change-Id: I502248fe76c26aa19102f413af72a7324c35b7f4
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 3e134b6e..123f4a9d 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -128,6 +128,7 @@ func init() { "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs", "LOCAL_JAVACFLAGS": "javacflags", + "LOCAL_ERROR_PRONE_FLAGS": "errorprone.javacflags", "LOCAL_DX_FLAGS": "dxflags", "LOCAL_JAVA_LIBRARIES": "libs", "LOCAL_STATIC_JAVA_LIBRARIES": "static_libs", diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index c85aaaac..3252791f 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -474,6 +474,24 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) } `, }, + { + desc: "errorprone options for java library", + in: ` + include $(CLEAR_VARS) + LOCAL_ERROR_PRONE_FLAGS := -Xep:AsyncCallableReturnsNull:ERROR -Xep:AsyncFunctionReturnsNull:ERROR + include $(BUILD_JAVA_LIBRARY) + `, + expected: ` + java_library { + errorprone: { + javacflags: [ + "-Xep:AsyncCallableReturnsNull:ERROR", + "-Xep:AsyncFunctionReturnsNull:ERROR", + ], + }, + } + `, + }, } func reformatBlueprint(input string) string { |