tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make backend for shared library fuzzing."

Browse source 
am: eed4e1324e

Change-Id: I92c6b52404570892124b7de71f11cbe109907534
This commit is contained in:
Mitch Phillips 2019-11-11 09:02:32 -08:00 committed by android-build-merger
commit 6462bbf0ba
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/Makefile
View file

@ -5096,6 +5096,19 @@ ifneq ($(sdk_repo_goal),)
include $(TOPDIR)development/build/tools/sdk_repo.mk include $(TOPDIR)development/build/tools/sdk_repo.mk
endif 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. # The rule to build all fuzz targets, and package them.
# Note: The packages are created in Soong, and in a perfect world, # 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 # directory`, because kati will see 'fuzz' as being a file, not a
# phony target. # phony target.
.PHONY: fuzz .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)) $(call dist-for-goals,fuzz,$(SOONG_FUZZ_PACKAGING_ARCH_MODULES))

1
core/clear_vars.mk
View file

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

6
core/soong_cc_prebuilt.mk
View file

@ -220,3 +220,9 @@ installed_static_library_notice_file_targets := \
$(notice_target): | $(installed_static_library_notice_file_targets) $(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target) $(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