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%