ASAN: Remove old list of services
Remove list of services and support for asan.options. This has not
been used in a while, and there is contention about listing names
of device-specific services.
Bug: 70387666
Test: m
Change-Id: I766c6b3a0c44b6b992a3259a3c4215a688452907
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 777fdb0..d1c0058 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -36,70 +36,6 @@
include $(BUILD_PREBUILT)
-# Modules for asan.options.X files.
-
-ASAN_OPTIONS_FILES :=
-
-define create-asan-options-module
-include $$(CLEAR_VARS)
-LOCAL_MODULE := asan.options.$(1)
-ASAN_OPTIONS_FILES += asan.options.$(1)
-LOCAL_MODULE_CLASS := ETC
-# The asan.options.off.template tries to turn off as much of ASAN as is possible.
-LOCAL_SRC_FILES := asan.options.off.template
-LOCAL_MODULE_PATH := $(TARGET_OUT)
-include $$(BUILD_PREBUILT)
-endef
-
-# Pretty comprehensive set of native services. This list is helpful if all that's to be checked is an
-# app.
-ifeq ($(SANITIZE_LITE_SERVICES),true)
-SANITIZE_ASAN_OPTIONS_FOR := \
- adbd \
- ATFWD-daemon \
- audioserver \
- bridgemgrd \
- cameraserver \
- cnd \
- debuggerd \
- dex2oat \
- drmserver \
- fingerprintd \
- gatekeeperd \
- installd \
- keystore \
- lmkd \
- logcat \
- logd \
- lowi-server \
- media.codec \
- mediadrmserver \
- media.extractor \
- mediaserver \
- mm-qcamera-daemon \
- mpdecision \
- netmgrd \
- perfd \
- perfprofd \
- qmuxd \
- qseecomd \
- rild \
- sdcard \
- servicemanager \
- slim_daemon \
- surfaceflinger \
- thermal-engine \
- time_daemon \
- update_engine \
- vold \
- wpa_supplicant \
- zip
-endif
-
-ifneq ($(SANITIZE_ASAN_OPTIONS_FOR),)
- $(foreach binary, $(SANITIZE_ASAN_OPTIONS_FOR), $(eval $(call create-asan-options-module,$(binary))))
-endif
-
# ASAN extration.
ASAN_EXTRACT_FILES :=
ifeq ($(SANITIZE_TARGET_SYSTEM),true)
diff --git a/rootdir/asan.options.off.template b/rootdir/asan.options.off.template
deleted file mode 100644
index 59a1249..0000000
--- a/rootdir/asan.options.off.template
+++ /dev/null
@@ -1,7 +0,0 @@
-quarantine_size_mb=0
-max_redzone=16
-poison_heap=false
-poison_partial=false
-poison_array_cookie=false
-alloc_dealloc_mismatch=false
-new_delete_type_mismatch=false