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

Commit e9c253fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix remote execution of r8 and d8 in make"

parents 4cdadae0 099349be

core/config.mk

+3 −3
Original line number Diff line number Diff line
@@ -431,6 +431,9 @@ $(hide) $(HOST_OTOOL) -l $(1) | grep LC_ID_DYLIB -A 5 > $(2) 
$(hide) $(HOST_NM) -gP $(1) | cut -f1-2 -d" " | (grep -v U$$ >> $(2) || true)

endef



# Pick a Java compiler.

include $(BUILD_SYSTEM)/combo/javac.mk



ifeq ($(CALLED_FROM_SETUP),true)

include $(BUILD_SYSTEM)/ccache.mk

include $(BUILD_SYSTEM)/goma.mk
@@ -453,9 +456,6 @@ ifeq (,$(filter 1 true,$(WITH_TIDY_ONLY))) 
  WITH_TIDY_ONLY :=

endif



# Pick a Java compiler.

include $(BUILD_SYSTEM)/combo/javac.mk



# ---------------------------------------------------------------

# Check that the configuration is current.  We check that

# BUILD_ENV_SEQUENCE_NUMBER is current against this value.

core/rbe.mk

+2 −2
Original line number Diff line number Diff line
@@ -81,11 +81,11 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
  endif



  ifdef RBE_R8

    R8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=r8 --exec_strategy=$(r8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=$(OUT_DIR)/soong/host/linux-x86/framework/r8-compat-proguard.jar,build/make/core/proguard_basic_keeps.flags --toolchain_inputs=$(JAVA))

    R8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=r8 --exec_strategy=$(r8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=$(OUT_DIR)/host/linux-x86/framework/r8.jar,build/make/core/proguard_basic_keeps.flags --toolchain_inputs=$(firstword $(JAVA)))

  endif



  ifdef RBE_D8

    D8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=d8 --exec_strategy=$(d8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=$(OUT_DIR)/soong/host/linux-x86/framework/d8.jar --toolchain_inputs=$(JAVA))

    D8_WRAPPER := $(strip $(RBE_WRAPPER) --labels=type=compile,compiler=d8 --exec_strategy=$(d8_exec_strategy) --platform=$(java_r8_d8_platform) --inputs=$(OUT_DIR)/host/linux-x86/framework/d8.jar --toolchain_inputs=$(firstword $(JAVA)))

  endif



  rbe_dir :=