diff options
| author | Andreas Gampe <agampe@google.com> | 2018-06-14 14:27:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-14 14:27:02 -0700 |
| commit | 5992da371ec867b6bb42255f69ed9459fb3b4b78 (patch) | |
| tree | 837d712c823334f146c16852fbf8f0919c0363fb | |
| parent | 4e236dc0f714ab62bfb6a9a8b34bff66d3aa0f95 (diff) | |
| parent | 20bf67fa69b19bfe41efadddc19998e2e85202ff (diff) | |
| download | apache-harmony-android-o-mr1-iot-release-1.0.4.tar.gz | |
Merge "Harmony: Suppress MissingOverride"android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3
am: 20bf67fa69
Change-Id: Ic664d8abace84576f4fbc2cf889fe68dc9d9db33
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | jdwp/Android.mk | 8 |
2 files changed, 12 insertions, 0 deletions
@@ -41,6 +41,8 @@ LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt # Pin java_version until jarjar is certified to support later versions. http://b/72703434 LOCAL_JAVA_LANGUAGE_VERSION := 1.8 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +# b/73499927 +LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF include $(BUILD_STATIC_JAVA_LIBRARY) ifeq ($(HOST_OS),linux) @@ -54,6 +56,8 @@ LOCAL_MODULE := apache-harmony-tests-hostdex # Pin java_version until jarjar is certified to support later versions. http://b/72703434 LOCAL_JAVA_LANGUAGE_VERSION := 1.8 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt +# b/73499927 +LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # HOST_OS == linux diff --git a/jdwp/Android.mk b/jdwp/Android.mk index 32b95fc..0a20fc8 100644 --- a/jdwp/Android.mk +++ b/jdwp/Android.mk @@ -39,6 +39,8 @@ LOCAL_NO_EMMA_COMPILE := true LOCAL_CTS_TEST_PACKAGE := android.jdwp LOCAL_CTS_TARGET_RUNTIME_ARGS := $(cts_jdwp_test_target_runtime_args) LOCAL_ERROR_PRONE_FLAGS := -Xep:ArrayToString:ERROR +# b/73499927 +LOCAL_ERROR_PRONE_FLAGS += -Xep:MissingOverride:OFF include $(BUILD_CTS_TARGET_JAVA_LIBRARY) include $(CLEAR_VARS) @@ -49,12 +51,16 @@ LOCAL_MODULE := apache-harmony-jdwp-tests LOCAL_NO_EMMA_INSTRUMENT := true LOCAL_NO_EMMA_COMPILE := true LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/jdwp +# b/73499927 +LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF include $(BUILD_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_public_jdwp_test_src_files) LOCAL_JAVA_LIBRARIES := junit-host LOCAL_MODULE := apache-harmony-jdwp-tests-host +# b/73499927 +LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF include $(BUILD_HOST_JAVA_LIBRARY) ifeq ($(HOST_OS),linux) @@ -62,5 +68,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(harmony_jdwp_test_src_files) LOCAL_JAVA_LIBRARIES := junit-hostdex LOCAL_MODULE := apache-harmony-jdwp-tests-hostdex +# b/73499927 +LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # HOST_OS == linux |