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

Commit 9b54ee8b authored Feb 16, 2018 by Andreas Gampe Committed by android-build-merger Feb 16, 2018

Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS" am: 304be2ec

am: 024e0819

Change-Id: I0f416bcecebbb0364345a4025dd8b3fef8617e28

parents 7f3bea59 024e0819

core/host_java_library.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -58,11 +58,6 @@ include $(BUILD_SYSTEM)/java_common.mk
		# 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

+5 −0

Original line number	Diff line number	Diff line
		@@ -48,3 +48,8 @@ endif

		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