diff options
| -rw-r--r-- | core/goma.mk | 3 | ||||
| -rw-r--r-- | core/host_dalvik_java_library.mk | 3 | ||||
| -rw-r--r-- | core/host_java_library.mk | 3 | ||||
| -rw-r--r-- | core/java.mk | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/core/goma.mk b/core/goma.mk index c265259da0..2b51d8be44 100644 --- a/core/goma.mk +++ b/core/goma.mk @@ -27,7 +27,8 @@ ifneq ($(filter-out false,$(USE_GOMA)),) # use both ccache and gomacc. CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC)) CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC)) - JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC)) + # b/143658984: goma can't handle the --system argument to javac + #JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC)) goma_dir := endif diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 882fe3a835..5021510a25 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -79,7 +79,8 @@ java_sources_deps := \ $(java_source_list_file): $(java_sources_deps) $(write-java-source-list) -$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL) +# TODO(b/143658984): goma can't handle the --system argument to javac. +#$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL) $(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := diff --git a/core/host_java_library.mk b/core/host_java_library.mk index beaea2ad71..8998d525e4 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -70,7 +70,8 @@ java_sources_deps := \ $(java_source_list_file): $(java_sources_deps) $(write-java-source-list) -$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL) +# TODO(b/143658984): goma can't handle the --system argument to javac. +#$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL) $(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := diff --git a/core/java.mk b/core/java.mk index a041321b63..44e005d8dc 100644 --- a/core/java.mk +++ b/core/java.mk @@ -274,7 +274,8 @@ $(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_ endif # TURBINE_ENABLED != false -$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL) +# TODO(b/143658984): goma can't handle the --system argument to javac. +#$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES) $(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES) |