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

Commit 9b32f8de authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

Merge "Remove env-var-allowlist" am: 3a7a960a am: c2c28f99 am: afd93ad9 

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

Change-Id: Iedd460165e61b33bddd9f6604a1d9d05e00886ab
parents 62966081 afd93ad9

core/config.mk

+0 −10
Original line number Diff line number Diff line
@@ -996,16 +996,6 @@ 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) $(RELATIVE_PWD) $(PRIVATE_CXX) \

$(hide) $(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) $(RELATIVE_PWD) $(PRIVATE_CC) \

$(hide) $(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 $@)

$(RELATIVE_PWD) $(PRIVATE_CC) \

$(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) $(RELATIVE_PWD) $(PRIVATE_CXX) \

$(hide) $(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) $(RELATIVE_PWD) $(PRIVATE_CC) \

$(hide) $(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) $(RELATIVE_PWD) $(PRIVATE_CC) \

$(hide) $(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 --env_var_allowlist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare)

  RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --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.