Commit a0e5cc5
committed
Correct test-only Android verification branches
Previously, the BuildConfig field used was not being evaluated at
compile-time like we expected. This resulted in test-only branches not
being eliminated by `javac` and remaining in the final artifact.
This both makes both auditing for correctness harder and inhibits more
future test-only code stripping, so we correct it by providing a more
narrowly scoped, and constant, boolean determined at build time based
off if any tests are being ran. This allows `javac` to remove test
branches entirely like we want.1 parent 9a7d773 commit a0e5cc5
File tree
2 files changed
+8
-4
lines changed- android/rustls-platform-verifier
- src/main/java/org/rustls/platformverifier
2 files changed
+8
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
6 | 8 | | |
7 | 9 | | |
8 | 10 | | |
| |||
28 | 30 | | |
29 | 31 | | |
30 | 32 | | |
| 33 | + | |
| 34 | + | |
31 | 35 | | |
32 | 36 | | |
33 | 37 | | |
| |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| |||
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
225 | | - | |
| 225 | + | |
226 | 226 | | |
227 | 227 | | |
228 | | - | |
| 228 | + | |
229 | 229 | | |
230 | 230 | | |
231 | 231 | | |
| |||
256 | 256 | | |
257 | 257 | | |
258 | 258 | | |
259 | | - | |
| 259 | + | |
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
| |||
0 commit comments