Merge "Make backend for shared library fuzzing." (eed4e132) · Commits · e / os / android_build

core/Makefile

+14 −1

Original line number	Diff line number	Diff line
		@@ -5096,6 +5096,19 @@ ifneq ($(sdk_repo_goal),)
		include $(TOPDIR)development/build/tools/sdk_repo.mk
		endif

		# -----------------------------------------------------------------
		# Soong generates the list of all shared libraries that are depended on by fuzz
		# targets. It saves this list as a source:destination pair to
		# FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS, where the source is the path to the
		# build of the unstripped shared library, and the destination is the
		# /data/fuzz/$ARCH/lib (for device) or /fuzz/$ARCH/lib (for host) directory
		# where fuzz target shared libraries are to be "reinstalled". The
		# copy-many-files below generates the rules to copy the unstripped shared
		# libraries to the device or host "reinstallation" directory. These rules are
		# depended on by each module in soong_cc_prebuilt.mk, where the module will have
		# a dependency on each shared library that it needs to be "reinstalled".
		FUZZ_SHARED_DEPS := $(call copy-many-files,$(strip $(FUZZ_TARGET_SHARED_DEPS_INSTALL_PAIRS)))

		# -----------------------------------------------------------------
		# The rule to build all fuzz targets, and package them.
		# Note: The packages are created in Soong, and in a perfect world,
		@@ -5107,5 +5120,5 @@ endif
		# directory`, because kati will see 'fuzz' as being a file, not a
		# phony target.
		.PHONY: fuzz
		fuzz: $(SOONG_FUZZ_PACKAGING_ARCH_MODULES)
		fuzz: $(SOONG_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_FUZZ_TARGETS)
		$(call dist-for-goals,fuzz,$(SOONG_FUZZ_PACKAGING_ARCH_MODULES))

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ LOCAL_FULL_LIBS_MANIFEST_FILES:=
		LOCAL_FULL_MANIFEST_FILE:=
		LOCAL_FULL_TEST_CONFIG:=
		LOCAL_FUZZ_ENGINE:=
		LOCAL_FUZZ_INSTALLED_SHARED_DEPS:=
		LOCAL_GCNO_FILES:=
		LOCAL_GENERATED_SOURCES:=
		# Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking.

core/soong_cc_prebuilt.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -220,3 +220,9 @@ installed_static_library_notice_file_targets := \

		$(notice_target): \| $(installed_static_library_notice_file_targets)
		$(LOCAL_INSTALLED_MODULE): \| $(notice_target)

		# Reinstall shared library dependencies of fuzz targets to /data/fuzz/ (for
		# target) or /data/ (for host).
		ifdef LOCAL_IS_FUZZ_TARGET
		$(LOCAL_INSTALLED_MODULE): $(LOCAL_FUZZ_INSTALLED_SHARED_DEPS)
		endif