Pass USE_REWRAPPER in soong_config Bug: b/374176548 Test: Manual Change-Id: I55dd22d1691209836addada589a7e436a2b483f8
diff --git a/core/rbe.mk b/core/rbe.mk index 0f90ddd..e1e7573 100644 --- a/core/rbe.mk +++ b/core/rbe.mk
@@ -15,7 +15,7 @@ # # Notice: this works only with Google's RBE service. -ifneq ($(filter-out false,$(USE_RBE)),) +ifneq ($(filter-out false,$(USE_REWRAPPER)),) ifdef RBE_DIR rbe_dir := $(RBE_DIR) else
diff --git a/core/soong_config.mk b/core/soong_config.mk index 4bfc188..fa4c0b1 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk
@@ -200,6 +200,7 @@ $(call add_json_bool, BuildingUserdataImage, $(BUILDING_USERDATA_IMAGE)) $(call add_json_bool, UseRBE, $(filter-out false,$(USE_RBE))) +$(call add_json_bool, UseREWrapper, $(filter-out false,$(USE_REWRAPPER))) $(call add_json_bool, UseRBEJAVAC, $(filter-out false,$(RBE_JAVAC))) $(call add_json_bool, UseRBER8, $(filter-out false,$(RBE_R8))) $(call add_json_bool, UseRBED8, $(filter-out false,$(RBE_D8)))