p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Filter and colorize javac output V3" am: c8387929d1 am: f4ef1db272 

am: 2f1488ae86

Change-Id: I73b5ca7a919c299aa062e5814f9f6b165f8c6527
This commit is contained in:
Colin Cross 2017-04-18 23:13:27 +00:00 committed by android-build-merger
parent 04299e0ba2 2f1488ae86
commit bb7ba04031
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@ -499,6 +499,8 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip
FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist
SOONG_JAVAC_WRAPPER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_wrapper
# Always use prebuilts for ckati and makeparallel # Always use prebuilts for ckati and makeparallel
prebuilt_build_tools := prebuilts/build-tools prebuilt_build_tools := prebuilts/build-tools
ifeq ($(filter address,$(SANITIZE_HOST)),) ifeq ($(filter address,$(SANITIZE_HOST)),)

2
core/definitions.mk
View File

@ -2214,7 +2214,7 @@ $(if $(PRIVATE_HAS_RS_SOURCES), \
$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \
| $(NORMALIZE_PATH) | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq | $(NORMALIZE_PATH) | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \
$(1) -encoding UTF-8 \ $(SOONG_JAVAC_WRAPPER) $(1) -encoding UTF-8 \
$(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \ $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
$(2) \ $(2) \
$(addprefix -classpath ,$(strip \ $(addprefix -classpath ,$(strip \

4
core/host_dalvik_java_library.mk
View File

@ -97,7 +97,9 @@ $(full_classes_compiled_jar): \
$(jar_manifest_file) \ $(jar_manifest_file) \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(annotation_processor_deps) \ $(annotation_processor_deps) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(NORMALIZE_PATH) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) \
| $(SOONG_JAVAC_WRAPPER)
$(transform-host-java-to-package) $(transform-host-java-to-package)
my_desugaring := my_desugaring :=

3
core/host_java_library.mk
View File

@ -76,7 +76,8 @@ $(full_classes_compiled_jar): \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(annotation_processor_deps) \ $(annotation_processor_deps) \
$(NORMALIZE_PATH) \ $(NORMALIZE_PATH) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES) \
| $(SOONG_JAVAC_WRAPPER)
$(transform-host-java-to-package) $(transform-host-java-to-package)
javac-check : $(full_classes_compiled_jar) javac-check : $(full_classes_compiled_jar)

3
core/java.mk
View File

@ -443,7 +443,8 @@ $(full_classes_compiled_jar): \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(annotation_processor_deps) \ $(annotation_processor_deps) \
$(NORMALIZE_PATH) \ $(NORMALIZE_PATH) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES) \
| $(SOONG_JAVAC_WRAPPER)
$(transform-java-to-classes.jar) $(transform-java-to-classes.jar)
javac-check : $(full_classes_compiled_jar) javac-check : $(full_classes_compiled_jar)