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

Commit 074d8e13 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Disable goma for javac actions in Make"

parents 701cb0c0 28ff3e3f

core/goma.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

core/host_dalvik_java_library.mk

+2 −1
Original line number Diff line number Diff line
@@ -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 :=

core/host_java_library.mk

+2 −1
Original line number Diff line number Diff line
@@ -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 :=

core/java.mk

+2 −1
Original line number Diff line number Diff line
@@ -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)