From c1f7035c319aa51fa60d0e038e1bbbb41ac588ea Mon Sep 17 00:00:00 2001 From: Oliver Nguyen Date: Fri, 6 Dec 2019 15:58:04 -0800 Subject: [PATCH] Set Clang coverage environment variables. Bug: 143977934 Test: m CLANG_COVERAGE=true and check LLVM_PROFILE_FILE is set Change-Id: I5aea5a38b9bec1670bf9c8d11d9c466c3b83e4d8 --- rootdir/Android.mk | 6 ++++++ rootdir/init.environ.rc.in | 1 + 2 files changed, 7 insertions(+) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 994d9aeda..9f9a2c3d6 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -67,6 +67,11 @@ ifeq ($(NATIVE_COVERAGE),true) EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/trace endif +EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := +ifeq ($(CLANG_COVERAGE),true) + EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS := export LLVM_PROFILE_FILE /data/misc/trace/clang-%p-%m.profraw +endif + # Put it here instead of in init.rc module definition, # because init.rc is conditionally included. # @@ -146,6 +151,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(hide) sed -i -e 's?%SYSTEMSERVERCLASSPATH%?$(PRODUCT_SYSTEM_SERVER_CLASSPATH)?g' $@ $(hide) sed -i -e 's?%EXPORT_GLOBAL_ASAN_OPTIONS%?$(EXPORT_GLOBAL_ASAN_OPTIONS)?g' $@ $(hide) sed -i -e 's?%EXPORT_GLOBAL_GCOV_OPTIONS%?$(EXPORT_GLOBAL_GCOV_OPTIONS)?g' $@ + $(hide) sed -i -e 's?%EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS%?$(EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS)?g' $@ $(hide) sed -i -e 's?%EXPORT_GLOBAL_HWASAN_OPTIONS%?$(EXPORT_GLOBAL_HWASAN_OPTIONS)?g' $@ # Append PLATFORM_VNDK_VERSION to base name. diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in index 50005d994..fdaaf1abe 100644 --- a/rootdir/init.environ.rc.in +++ b/rootdir/init.environ.rc.in @@ -15,4 +15,5 @@ on early-init export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH% %EXPORT_GLOBAL_ASAN_OPTIONS% %EXPORT_GLOBAL_GCOV_OPTIONS% + %EXPORT_GLOBAL_CLANG_COVERAGE_OPTIONS% %EXPORT_GLOBAL_HWASAN_OPTIONS%