Chromium Code Reviews| Index: components/cronet/android/BUILD.gn |
| diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn |
| index ec59f29b533bb89e8003bd485fd092ab07ab7ac5..ae93970be36cbf1b57e97dd6796a516df9331776 100644 |
| --- a/components/cronet/android/BUILD.gn |
| +++ b/components/cronet/android/BUILD.gn |
| @@ -377,28 +377,30 @@ android_resources("cronet_sample_test_apk_resources") { |
| android_manifest = "sample/AndroidManifest.xml" |
| } |
| -instrumentation_test_apk("cronet_sample_test_apk") { |
| - apk_name = "CronetSampleTest" |
| - apk_under_test = ":cronet_sample_apk" |
| - android_manifest = "sample/javatests/AndroidManifest.xml" |
| - java_files = [ |
| - "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java", |
| - "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java", |
| - ] |
| +if (!enable_all_proguard_optimizations) { |
| + instrumentation_test_apk("cronet_sample_test_apk") { |
|
mef
2016/07/13 15:12:07
So, if enable_all_proguard_optimizations is true,
smaier
2016/07/13 15:31:16
You have this correct - again, we typically only h
mef
2016/07/13 16:49:40
Just to clarify - the main purpose of cronet_sampl
smaier
2016/07/13 18:13:31
Agreed - this helped us discover an issue with whe
|
| + apk_name = "CronetSampleTest" |
| + apk_under_test = ":cronet_sample_apk" |
| + android_manifest = "sample/javatests/AndroidManifest.xml" |
| + java_files = [ |
| + "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java", |
| + "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java", |
| + ] |
| - deps = [ |
| - ":cronet_api", |
| - ":cronet_java", |
| - ":cronet_sample_apk_java", |
| - ":cronet_sample_test_apk_resources", |
| - "//base:base_java", |
| - "//base:base_java_test_support", |
| - "//net/android:net_java_test_support", |
| - ] |
| - additional_apks = [ "//net/android:net_test_support_apk" ] |
| + deps = [ |
| + ":cronet_api", |
| + ":cronet_java", |
| + ":cronet_sample_apk_java", |
| + ":cronet_sample_test_apk_resources", |
| + "//base:base_java", |
| + "//base:base_java_test_support", |
| + "//net/android:net_java_test_support", |
| + ] |
| + additional_apks = [ "//net/android:net_test_support_apk" ] |
| - run_findbugs_override = true |
| - proguard_enabled = !is_java_debug |
| + run_findbugs_override = true |
| + proguard_enabled = !is_java_debug |
|
mef
2016/07/13 15:12:07
Should proguard_enabled be conditioned on enable_a
smaier
2016/07/13 15:31:16
Added an assert in config.gni to ensure sanity her
|
| + } |
| } |
| generate_jni("cronet_tests_jni_headers") { |