commit 304be2ec74f8cada01b4dc9f2f6a4418c0be59cc
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 16 01:04:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 16 01:04:45 2018 +0000
tree acc23d4a9d4bd873ffa8af0ca1b6fd99b3f62643
parent b9a66a6250117846be11efd75b2e6be04e65e356
parent 21a1c6d03f1e70eeab512990e955edb3c682ec06

Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS"

core/host_java_library.mk

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index c780d47..5176f37 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -58,11 +58,6 @@
 # Run build/make/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
-
 # List of dependencies for anything that needs all java sources in place
 java_sources_deps := \
     $(java_sources) \

core/host_java_library_common.mk

diff --git a/core/host_java_library_common.mk b/core/host_java_library_common.mk
index 8df4b37..51e2d94 100644
--- a/core/host_java_library_common.mk
+++ b/core/host_java_library_common.mk
@@ -48,3 +48,8 @@
 
 LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
 LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
+
+# 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