Merge "fortify_test.cpp: _FORTIFY_SOURCE=3 should be a superset of 2." into main am: 1669ab022b

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3544719

Change-Id: I761f9dbdce926ed63e05cd117cc0354102f64d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/fortify_test.cpp b/tests/fortify_test.cpp
index ee71f03..fd1680b 100644
--- a/tests/fortify_test.cpp
+++ b/tests/fortify_test.cpp
@@ -43,7 +43,7 @@
 
 using DEATHTEST = SilentDeathTest;
 
-#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE == 2
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE >= 2
 struct foo {
   char empty[0];
   char one[1];