From eb8d4032738cfb308c2802ad8d514528e8f63403 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Mon, 27 Jul 2020 11:22:35 -0700 Subject: [PATCH] Rename CFI blocklist files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update language to comply with Android’s inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: build Change-Id: I3de274e58135660e102c276a9822a2ef2cd7cba8 --- ..._overflow_blacklist.txt => integer_overflow_blocklist.txt} | 0 cc/sanitize.go | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename cc/config/{integer_overflow_blacklist.txt => integer_overflow_blocklist.txt} (100%) diff --git a/cc/config/integer_overflow_blacklist.txt b/cc/config/integer_overflow_blocklist.txt similarity index 100% rename from cc/config/integer_overflow_blacklist.txt rename to cc/config/integer_overflow_blocklist.txt diff --git a/cc/sanitize.go b/cc/sanitize.go index 72ad6d7a0..384814810 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -51,7 +51,7 @@ var ( } cfiCflags = []string{"-flto", "-fsanitize-cfi-cross-dso", - "-fsanitize-blacklist=external/compiler-rt/lib/cfi/cfi_blacklist.txt"} + "-fsanitize-blacklist=external/compiler-rt/lib/cfi/cfi_blocklist.txt"} // -flto and -fvisibility are required by clang when -fsanitize=cfi is // used, but have no effect on assembly files cfiAsflags = []string{"-flto", "-fvisibility=default"} @@ -61,7 +61,7 @@ var ( cfiStaticLibsMutex sync.Mutex hwasanStaticLibsMutex sync.Mutex - intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blacklist.txt"} + intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blocklist.txt"} minimalRuntimeFlags = []string{"-fsanitize-minimal-runtime", "-fno-sanitize-trap=integer,undefined", "-fno-sanitize-recover=integer,undefined"}