Merge "Convert `asan.options` and `asan_extract` to Android.bp" into main (196a8023) · Commits · e / os / android_system_core

rootdir/Android.bp

+14 −1

Original line number	Diff line number	Diff line
		@@ -114,6 +114,19 @@ prebuilt_etc {
		sub_dir: "init",
		}

		prebuilt_etc {
		name: "asan.options",
		src: "asan.options",
		}

		sh_binary {
		name: "asan_extract",
		src: "asan_extract.sh",
		init_rc: ["asan_extract.rc"],
		// We need bzip2 on device for extraction.
		required: ["bzip2"],
		}

		llndk_libraries_txt {
		name: "llndk.libraries.txt",
		}

+0 −27

Original line number	Diff line number	Diff line
		@@ -3,39 +3,12 @@ LOCAL_PATH:= $(call my-dir)
		$(eval $(call declare-1p-copy-files,system/core/rootdir,))

		#######################################
		# asan.options
		ifneq ($(filter address,$(SANITIZE_TARGET)),)

		include $(CLEAR_VARS)

		LOCAL_MODULE := asan.options
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_MODULE_CLASS := ETC
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		LOCAL_MODULE_PATH := $(TARGET_OUT)

		include $(BUILD_PREBUILT)

		# ASAN extration.
		ASAN_EXTRACT_FILES :=
		ifeq ($(SANITIZE_TARGET_SYSTEM),true)
		include $(CLEAR_VARS)
		LOCAL_MODULE:= asan_extract
		LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS:= notice
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_CLASS := EXECUTABLES
		LOCAL_SRC_FILES := asan_extract.sh
		LOCAL_INIT_RC := asan_extract.rc
		# We need bzip2 on device for extraction.
		LOCAL_REQUIRED_MODULES := bzip2
		include $(BUILD_PREBUILT)
		ASAN_EXTRACT_FILES := asan_extract
		endif

		endif

		#######################################
		# init.environ.rc