commit 20bf67fa69b19bfe41efadddc19998e2e85202ff
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 14 21:04:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 14 21:04:20 2018 +0000
tree 837d712c823334f146c16852fbf8f0919c0363fb
parent c7b2514d479c53b6965bfcfa40f14ec373549660
parent 2eb2f5733ca988115d4a00cadac07d6f7b7fe7d4

Merge "Harmony: Suppress MissingOverride"

Android.mk

diff --git a/Android.mk b/Android.mk
index 89b2c6f..5797bd7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,6 +41,8 @@
 # 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 @@
 # 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
 

jdwp/Android.mk

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_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_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 @@
 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