summaryrefslogtreecommitdiff
path: root/hostsidetests/security/src/android/security/cts/KernelConfigTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'hostsidetests/security/src/android/security/cts/KernelConfigTest.java')
-rw-r--r--hostsidetests/security/src/android/security/cts/KernelConfigTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/hostsidetests/security/src/android/security/cts/KernelConfigTest.java b/hostsidetests/security/src/android/security/cts/KernelConfigTest.java
index 09bee6455e5..96cd045289d 100644
--- a/hostsidetests/security/src/android/security/cts/KernelConfigTest.java
+++ b/hostsidetests/security/src/android/security/cts/KernelConfigTest.java
@@ -111,7 +111,8 @@ public class KernelConfigTest extends DeviceTestCase implements IBuildReceiver,
@CddTest(requirement="9.7/C-0-7")
public void testConfigStackProtectorStrong() throws Exception {
assertTrue("Linux kernel must have Stack Protector enabled: " +
- "CONFIG_CC_STACKPROTECTOR_STRONG=y",
+ "CONFIG_STACKPROTECTOR_STRONG=y or CONFIG_CC_STACKPROTECTOR_STRONG=y",
+ configSet.contains("CONFIG_STACKPROTECTOR_STRONG=y") ||
configSet.contains("CONFIG_CC_STACKPROTECTOR_STRONG=y"));
}