Merge "cronet: disable building tests in tm-mainline-prod" into tm-mainline-prod
This commit is contained in:
commit
f8afb2d4e6
1 changed files with 1 additions and 1 deletions
|
|
@ -21,7 +21,7 @@ package {
|
|||
// cronet_test_java_defaults can be used to specify a java_defaults target that
|
||||
// either enables or disables Cronet tests. This is used to disable Cronet
|
||||
// tests on tm-mainline-prod where the required APIs are not present.
|
||||
cronet_test_java_defaults = "CronetTestJavaDefaultsEnabled"
|
||||
cronet_test_java_defaults = "CronetTestJavaDefaultsDisabled"
|
||||
// This is a placeholder comment to avoid merge conflicts
|
||||
// as cronet_test_java_defaults may have different values
|
||||
// depending on the branch
|
||||
|
|
|
|||
Loading…
Reference in a new issue