Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ca9298d authored by Paul Duffin's avatar Paul Duffin
Browse files

Add support for LOCAL_ERROR_PRONE_FLAGS 

This will allow individual modules to enable error prone checks
as needed so that the change to treat an error prone check as a
compiler error can be done atomically with the changes to fix
the issues that check reveals.

Tested with the following steps, cleaning up the targets in
between to ensure that it was rebuilt everytime.

Set LOCAL_ERROR_PRONE_FLAGS := -Xep:ClassCanBeStatic:WARN
compiler error in junit-params-test target. Built
javac-check-junit-params-test with RUN_ERROR_PRONE=true to make
sure that compilation failed.

Built the javac-check-junit-params-test without RUN_ERROR_PRONE
set to make sure that the flag is not included unless explicitly
requested.

Built the junit-params-test as normal to make sure it still
worked properly.

Bug: 31507496
Test: See above
Change-Id: I88b5800dacd0e30dd9dcfa5f42e89d1428957365
parent b6e788ff

core/build-system.html

+5 −0
Original line number Diff line number Diff line
@@ -707,6 +707,11 @@ example.</p> 
them here.  For example:</p>

<p><code>LOCAL_JAVACFLAGS += -Xlint:deprecation</code></p>



<h4>LOCAL_ERROR_PRONE_FLAGS</h4>

<p>If you have additional flags to pass into the error prone compiler, add

them here.  For example:</p>

<p><code>LOCAL_ERROR_PRONE_FLAGS += -Xep:ClassCanBeStatic:ERROR</code></p>



<h4>LOCAL_JAVA_LIBRARIES</h4>

<p>When linking Java apps and libraries, <code>LOCAL_JAVA_LIBRARIES</code>

specifies which sets of java classes to include.  Currently there are

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ LOCAL_PREBUILT_STRIP_COMMENTS:= 
LOCAL_INTERMEDIATE_SOURCES:=

LOCAL_INTERMEDIATE_SOURCE_DIR:=

LOCAL_JAVACFLAGS:=

LOCAL_ERROR_PRONE_FLAGS:=

LOCAL_JAVA_LIBRARIES:=

LOCAL_JAVA_LAYERS_FILE:=

LOCAL_NO_STANDARD_LIBRARIES:=

core/host_java_library.mk

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ include $(BUILD_SYSTEM)/java_common.mk 
# Run build/tools/java-layers.py for more details.

layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))



# If error prone is enabled then add LOCAL_ERROR_PRONE_FLAGS to LOCAL_JAVACFLAGS

ifeq ($(RUN_ERROR_PRONE),true)

LOCAL_JAVACFLAGS += $(LOCAL_ERROR_PRONE_FLAGS)

endif



$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=

core/java.mk

+6 −0
Original line number Diff line number Diff line
@@ -398,6 +398,12 @@ $(full_classes_compiled_jar): PRIVATE_WARNINGS_ENABLE := $(LOCAL_WARNINGS_ENABLE 
# This intentionally depends on java_sources, not all_java_sources.

# Deps for generated source files must be handled separately,

# via deps on the target that generates the sources.



# If error prone is enabled then add LOCAL_ERROR_PRONE_FLAGS to LOCAL_JAVACFLAGS

ifeq ($(RUN_ERROR_PRONE),true)

LOCAL_JAVACFLAGS += $(LOCAL_ERROR_PRONE_FLAGS)

endif



$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES)