openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Build: Move LOCAL_ERROR_PRONE_FLAGS" am: 304be2ec74 

am: 024e08192e

Change-Id: I0f416bcecebbb0364345a4025dd8b3fef8617e28
This commit is contained in:
Andreas Gampe 2018-02-16 01:31:20 +00:00 committed by android-build-merger
parent 7f3bea5982 024e08192e
commit 9b54ee8bf3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/host_java_library.mk
View File

@ -58,11 +58,6 @@ include $(BUILD_SYSTEM)/java_common.mk
# Run build/make/tools/java-layers.py for more details. # Run build/make/tools/java-layers.py for more details.
layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE)) 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 # List of dependencies for anything that needs all java sources in place
java_sources_deps := \ java_sources_deps := \
$(java_sources) \ $(java_sources) \

5
core/host_java_library_common.mk
View File

@ -48,3 +48,8 @@ endif
LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) 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