diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2018-10-12 21:45:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 21:45:56 +0000 |
| commit | b3bc8427505c55a4134eac438f118a9b1acb4e2f (patch) | |
| tree | ad98d5c9b6e79d151148e9fc26d5ec874957c358 /rootdir | |
| parent | 1f149d8d2acecabb594e6fd6b60c81e5ab3e3b25 (diff) | |
| parent | 30917f77baaabd2236f29d22194c4ff76043ffeb (diff) | |
| download | system_core-b3bc8427505c55a4134eac438f118a9b1acb4e2f.tar.gz system_core-b3bc8427505c55a4134eac438f118a9b1acb4e2f.tar.bz2 system_core-b3bc8427505c55a4134eac438f118a9b1acb4e2f.zip | |
Merge "Export HWASAN_OPTIONS when SANITIZE_TARGET:=hwaddress"
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 8 | ||||
| -rw-r--r-- | rootdir/init.environ.rc.in | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index a4c3955a7..e4e165086 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -67,6 +67,13 @@ ifneq ($(filter address,$(SANITIZE_TARGET)),) LOCAL_REQUIRED_MODULES := asan.options $(ASAN_OPTIONS_FILES) $(ASAN_EXTRACT_FILES) endif +EXPORT_GLOBAL_HWASAN_OPTIONS := +ifneq ($(filter hwaddress,$(SANITIZE_TARGET)),) + ifneq ($(HWADDRESS_SANITIZER_GLOBAL_OPTIONS),) + EXPORT_GLOBAL_HWASAN_OPTIONS := export HWASAN_OPTIONS $(HWADDRESS_SANITIZER_GLOBAL_OPTIONS) + endif +endif + EXPORT_GLOBAL_GCOV_OPTIONS := ifeq ($(NATIVE_COVERAGE),true) EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/gcov @@ -151,6 +158,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep) $(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_HWASAN_OPTIONS%?$(EXPORT_GLOBAL_HWASAN_OPTIONS)?g' $@ bcp_md5 := bcp_dep := diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in index 2e2ab7465..457677678 100644 --- a/rootdir/init.environ.rc.in +++ b/rootdir/init.environ.rc.in @@ -11,3 +11,4 @@ on init export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH% %EXPORT_GLOBAL_ASAN_OPTIONS% %EXPORT_GLOBAL_GCOV_OPTIONS% + %EXPORT_GLOBAL_HWASAN_OPTIONS% |