Revert "Change PRODUCT_CFI_INCLUDE_PATHS to opt-out (Make)"
This reverts commit f03a265786a9e8a4fc6b843f38aded7b586563e3.
Change-Id: I3ca0e2f9e3938b49919a8530b393ba3dba4f118c
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index a4c103c..9ea1ff4 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -98,17 +98,13 @@
# Enable CFI in included paths.
ifeq ($(filter cfi, $(my_sanitize)),)
-# Do not rely on include paths for anything other than ARM64.
-# TODO: Relax this constraint for 2019.
- ifneq ($(filter arm64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
- combined_include_paths := $(CFI_INCLUDE_PATHS) \
- $(PRODUCT_CFI_INCLUDE_PATHS)
+ combined_include_paths := $(CFI_INCLUDE_PATHS) \
+ $(PRODUCT_CFI_INCLUDE_PATHS)
- ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
- $(filter $(dir)%,$(LOCAL_PATH)))),)
- my_sanitize := cfi $(my_sanitize)
- my_sanitize_diag := cfi $(my_sanitize_diag)
- endif
+ ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_include_paths)),\
+ $(filter $(dir)%,$(LOCAL_PATH)))),)
+ my_sanitize := cfi $(my_sanitize)
+ my_sanitize_diag := cfi $(my_sanitize_diag)
endif
endif
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 5825816..3f1d6df 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -121,27 +121,3 @@
system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \
system/core/rootdir/ueventd.rc:root/ueventd.rc \
system/core/rootdir/etc/hosts:system/etc/hosts
-
-# This is a set of common components to enable CFI for (across
-# compatible product configs)
-PRODUCT_CFI_INCLUDE_PATHS := \
- device/google/cuttlefish_common/guest/libs/wpa_supplicant_8_lib \
- device/google/wahoo/wifi_offload \
- external/tinyxml2 \
- external/wpa_supplicant_8 \
- frameworks/av/camera \
- frameworks/av/media \
- frameworks/av/services \
- frameworks/minikin \
- hardware/broadcom/wlan/bcmdhd/wpa_supplicant_8_lib \
- hardware/interfaces/nfc \
- hardware/qcom/wlan/qcwcn/wpa_supplicant_8_lib \
- harware/interfaces/keymaster \
- system/bt \
- system/chre \
- system/core/libnetutils \
- system/core/libziparchive \
- system/gatekeeper \
- system/keymaster \
- system/nfc \
- system/security \