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

Commit d619899f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove env-var-allowlist"" am: fd8dae60 am: fe4c812b am: 605eb541 

Original change: https://android-review.googlesource.com/c/platform/build/+/1465913

Change-Id: I6738f446fbecdc621eed1b6cf48c36b3934cf0fe
parents 0189ce22 605eb541

core/config.mk

+10 −0
Original line number Diff line number Diff line
@@ -997,6 +997,16 @@ endif # PRODUCT_USE_DYNAMIC_PARTITIONS 
# Set up final options.

# ###############################################################



# We run gcc/clang with PWD=/proc/self/cwd to remove the $TOP

# from the debug output. That way two builds in two different

# directories will create the same output.

# /proc doesn't exist on Darwin.

ifeq ($(HOST_OS),linux)

RELATIVE_PWD := PWD=/proc/self/cwd

else

RELATIVE_PWD :=

endif



# Flags for DEX2OAT

first_non_empty_of_three = $(if $(1),$(1),$(if $(2),$(2),$(3)))

DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)

core/definitions.mk

+6 −6
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ define transform-cpp-to-o 
@echo "$($(PRIVATE_PREFIX)DISPLAY) $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(if $(PRIVATE_TIDY_CHECKS),$(clang-tidy-cpp))

$(hide) $(PRIVATE_CXX) \

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \

  $(transform-cpp-to-o-compiler-args) \

  -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

endef
@@ -1225,7 +1225,7 @@ define transform-c-to-o 
@echo "$($(PRIVATE_PREFIX)DISPLAY) $(PRIVATE_ARM_MODE) C: $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(if $(PRIVATE_TIDY_CHECKS),$(clang-tidy-c))

$(hide) $(PRIVATE_CC) \

$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \

  $(transform-c-to-o-compiler-args) \

  -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

endef
@@ -1234,7 +1234,7 @@ endif 
define transform-s-to-o

@echo "$($(PRIVATE_PREFIX)DISPLAY) asm: $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(PRIVATE_CC) \

$(RELATIVE_PWD) $(PRIVATE_CC) \

  $(call transform-c-or-s-to-o-compiler-args, $(PRIVATE_ASFLAGS)) \

  -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

endef
@@ -1293,7 +1293,7 @@ define transform-host-cpp-to-o 
@echo "$($(PRIVATE_PREFIX)DISPLAY) C++: $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(if $(PRIVATE_TIDY_CHECKS),$(clang-tidy-host-cpp))

$(hide) $(PRIVATE_CXX) \

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \

  $(transform-host-cpp-to-o-compiler-args) \

  -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

endef
@@ -1316,7 +1316,7 @@ endef 
# $(1): extra flags

define transform-host-c-or-s-to-o

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_CC) \

$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \

  $(transform-host-c-or-s-to-o-common-args) \

  $(1) \

  -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<
@@ -1343,7 +1343,7 @@ define transform-host-c-to-o 
@echo "$($(PRIVATE_PREFIX)DISPLAY) C: $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(if $(PRIVATE_TIDY_CHECKS), $(clang-tidy-host-c))

$(hide) $(PRIVATE_CC) \

$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \

  $(transform-host-c-to-o-compiler-args) \

  -MD -MF $(patsubst %.o,%.d,$@) -o $@ $<

endef

core/rbe.mk

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) 
  java_r8_d8_platform := $(platform),Pool=java16



  RBE_WRAPPER := $(rbe_dir)/rewrapper

  RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare)

  RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_allowlist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare)



  # Append rewrapper to existing *_WRAPPER variables so it's possible to

  # use both ccache and rewrapper.