commit 166c78939dfb8ba09174c1d7741e0607c9d85bdb
author Andreas Gampe <agampe@google.com> Mon Feb 19 18:55:53 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 19 18:55:53 2018 +0000
tree 031924701047176061b0ed2a8b9027211de22014
parent 31d7642eb8f37a9166db7f1c9e313ab651bdb8ba
parent 5fbf2cf083b2050edd7bf643128b6697da23aded

Merge "Apache-Xml: Suppress MissingOverride warnings" am: 3e727b936c am: 9754b2c9de
am: 5fbf2cf083

Change-Id: Ic700968bc5fb4ce42439ecdfab7929ff434a5740

Android.mk

diff --git a/Android.mk b/Android.mk
index 1e31ae0..266943f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@
 LOCAL_JAVA_LIBRARIES := core-oj core-libart
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_RESOURCE_DIRS := src/main/java
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
 include $(BUILD_JAVA_LIBRARY)
 
 ifeq ($(HOST_OS),linux)
@@ -33,5 +34,6 @@
 LOCAL_SRC_FILES := $(apache-xml_src_files)
 LOCAL_MODULE_TAGS := optional
 LOCAL_JAVA_RESOURCE_DIRS := src/main/java
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 endif  # HOST_OS == linux