summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2018-02-19 18:56:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-19 18:56:07 +0000
commit181b44b0422f2ca9a844a39f0b7e7f20c2712b72 (patch)
tree184705a855273d398ba0474718fed9d5df1fcc70
parentce46429bd0e53ed381cb5b18c5824ed3ce0a383e (diff)
parent6b4939f645487fe3d85d388793a9ecaa07928715 (diff)
downloademma-android-o-mr1-iot-release-smart-clock-r6.tar.gz
Merge "Emma: Suppress MissingOverride warnings" am: 2488a22acf am: 706655d13dandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 6b4939f645 Change-Id: I7a7d78fc9f3189ddc6afc07f3d537a049db2bea8
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index f863cf6..dc80a4a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,8 @@ LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
LOCAL_SDK_VERSION := 9
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+
include $(BUILD_STATIC_JAVA_LIBRARY)
@@ -31,4 +33,6 @@ LOCAL_MODULE := emmalib
LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+
include $(BUILD_HOST_JAVA_LIBRARY)