diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-12 08:12:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-12 08:12:29 +0000 |
| commit | 3c5ee5d6f2f50895611eacd71a62b11efcfb0648 (patch) | |
| tree | 14f5618ff219f9c077ad59268251b1b373095432 | |
| parent | 4402d5d4938cfd94966417287bc6da315b1a9605 (diff) | |
| parent | 056f4c0630e9374158768f0fb3be3abcc90b93c2 (diff) | |
| download | platform_tools_security-android10-qpr1-release.tar.gz platform_tools_security-android10-qpr1-release.tar.bz2 platform_tools_security-android10-qpr1-release.zip | |
Merge "Fix sanitizer-status for hwasan builds"android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
| -rw-r--r-- | sanitizer-status/sanitizer-status.c | 2 | ||||
| -rw-r--r-- | sanitizer-status/sanitizer-status.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sanitizer-status/sanitizer-status.c b/sanitizer-status/sanitizer-status.c index 3f8f350..41af3f8 100644 --- a/sanitizer-status/sanitizer-status.c +++ b/sanitizer-status/sanitizer-status.c @@ -143,7 +143,7 @@ int sanitizer_status(int argc, const char** argv) { if (test_everything || have_option("asan", argv, argc)) { int asan_failures = 0; -#ifndef ANDROID_SANITIZE_ADDRESS +#if !defined(ANDROID_SANITIZE_ADDRESS) && !defined(ANDROID_SANITIZE_HWADDRESS) asan_failures += 1; printf("ASAN: Compiler flags failed!\n"); #endif diff --git a/sanitizer-status/sanitizer-status.go b/sanitizer-status/sanitizer-status.go index 9154e22..2c75e9f 100644 --- a/sanitizer-status/sanitizer-status.go +++ b/sanitizer-status/sanitizer-status.go @@ -28,6 +28,9 @@ func loadHook(ctx android.LoadHookContext) { if android.InList("address", sanitizers) { p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_ADDRESS=1") } + if android.InList("hwaddress", sanitizers) { + p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_HWADDRESS=1") + } if android.InList("coverage", sanitizers) { p.Cflags = append(p.Cflags, "-DANDROID_SANITIZE_COVERAGE=1") } |