From bd40595d86aa1151bf38b08405ed6b399c18a243 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 30 Jan 2018 18:23:53 -0800 Subject: [PATCH] Stubs: Disable Errorprone warnings The stubs are auto-generated and lack lots of annotations. Furthermore, the originating code will already lead to warnings. So suppress all Errorprone warnings for stub code. Test: m Test: m javac-check RUN_ERROR_PRONE=true Change-Id: I214f348e2ecef5d640fa488f3d4cf9a18b942430 --- build/build_android_stubs.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build/build_android_stubs.mk b/build/build_android_stubs.mk index 212835175..144bcd0ba 100644 --- a/build/build_android_stubs.mk +++ b/build/build_android_stubs.mk @@ -31,6 +31,14 @@ $(full_target): PRIVATE_FRAMEWORK_RES_PACKAGE := $(framework_res_package) $(full_target): PRIVATE_CLASS_INTERMEDIATES_DIR := $(classes_dir) +# Disable all warnings. For one, stubs are auto-generated and lack annotations currently. Second, +# any warnings should have been emitted for the stub sources. +ifeq (true,$(RUN_ERROR_PRONE)) +$(full_target): PRIVATE_ERRORPRONE_FLAGS := -XepDisableAllChecks +else +$(full_target): PRIVATE_ERRORPRONE_FLAGS := +endif + $(full_src_target): $(stub_timestamp) @echo Packaging SDK Stub sources: $@ $(hide) cd $(PRIVATE_INTERMEDIATES_DIR) && zip -rq $(notdir $@) $(notdir $(PRIVATE_SRC_DIR)) @@ -53,8 +61,9 @@ $(full_target): $(stub_timestamp) $(framework_res_package) $(ZIPTIME) $(hide) $(ACP) libcore/NOTICE $(PRIVATE_CLASS_INTERMEDIATES_DIR)/NOTICES/libcore-NOTICE $(hide) $(ACP) libcore/ojluni/NOTICE $(PRIVATE_CLASS_INTERMEDIATES_DIR)/NOTICES/ojluni-NOTICE $(hide) find $(PRIVATE_SRC_DIR) -name "*.java" > \ - $(PRIVATE_INTERMEDIATES_DIR)/java-source-list - $(hide) $(TARGET_JAVAC) -source 1.8 -target 1.8 -encoding UTF-8 -bootclasspath "" \ + $(PRIVATE_INTERMEDIATES_DIR)/java-source-list + $(hide) $(TARGET_JAVAC) $(PRIVATE_ERRORPRONE_FLAGS) \ + -source 1.8 -target 1.8 -encoding UTF-8 -bootclasspath "" \ -g -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ \@$(PRIVATE_INTERMEDIATES_DIR)/java-source-list \ || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 )