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

Commit 1b102d78 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Remove references to goma" into main

parents 47e9257d 1db66e6b

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -133,12 +133,12 @@ endif 
my_tidy_checks := $(subst $(space),,$(my_tidy_checks))



# Configure the pool to use for clang rules.

# If LOCAL_CC or LOCAL_CXX is set don't use goma or RBE.

# If LOCAL_CC or LOCAL_CXX is set don't RBE.

# If clang-tidy is being used, don't use the RBE pool (as clang-tidy runs in

# the same action, and is not remoted)

my_pool :=

ifeq (,$(strip $(my_cc))$(strip $(my_cxx))$(strip $(my_tidy_checks)))

  my_pool := $(GOMA_OR_RBE_POOL)

  my_pool := $(RBE_POOL)

endif



ifneq (,$(strip $(foreach dir,$(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))

core/config.mk

+3 −9
Original line number Diff line number Diff line
@@ -1164,20 +1164,14 @@ define find_warning_allowed_projects 
    $(filter $(ANDROID_WARNING_ALLOWED_PROJECTS),$(1)/)

endef



GOMA_POOL :=

RBE_POOL :=

GOMA_OR_RBE_POOL :=

# When goma or RBE are enabled, kati will be passed --default_pool=local_pool to put

# When RBE is enabled, kati will be passed --default_pool=local_pool to put

# most rules into the local pool.  Explicitly set the pool to "none" for rules that

# should be run outside the local pool, i.e. with -j500.

ifneq (,$(filter-out false,$(USE_GOMA)))

  GOMA_POOL := none

  GOMA_OR_RBE_POOL := none

else ifneq (,$(filter-out false,$(USE_RBE)))

ifneq (,$(filter-out false,$(USE_RBE)))

  RBE_POOL := none

  GOMA_OR_RBE_POOL := none

endif

.KATI_READONLY := GOMA_POOL RBE_POOL GOMA_OR_RBE_POOL

.KATI_READONLY := RBE_POOL



JAVAC_NINJA_POOL :=

R8_NINJA_POOL :=

core/host_java_library.mk

+1 −3
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ java_sources_deps := \ 
$(java_source_list_file): $(java_sources_deps)

	$(write-java-source-list)



# 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 :=

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

core/java.mk

+0 −2
Original line number Diff line number Diff line
@@ -257,8 +257,6 @@ $(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_ 


endif # TURBINE_ENABLED != false



# 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): .KATI_NINJA_POOL := $(JAVAC_NINJA_POOL)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ $(call add_json_bool, BuildingRecoveryImage, $(BUILDING_RECOVERY_IMA 
$(call add_json_str,  UserdataPath,                      $(TARGET_COPY_OUT_DATA))

$(call add_json_bool, BuildingUserdataImage,             $(BUILDING_USERDATA_IMAGE))



$(call add_json_bool, UseGoma,                           $(filter-out false,$(USE_GOMA)))

$(call add_json_bool, UseRBE,                            $(filter-out false,$(USE_RBE)))

$(call add_json_bool, UseRBEJAVAC,                       $(filter-out false,$(RBE_JAVAC)))

$(call add_json_bool, UseRBER8,                          $(filter-out false,$(RBE_R8)))