Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: components/cronet/android/BUILD.gn

Issue 2217073004: Re-enable CronetSampleTest#testLoadUrl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix BUILD Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/version.gni") 8 import("//build/util/version.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 ] 394 ]
395 } 395 }
396 } 396 }
397 397
398 # cronet_sample_test_apk_resources is identical to 398 # cronet_sample_test_apk_resources is identical to
399 # cronet_sample_apk_resources. The two have to be different targets because 399 # cronet_sample_apk_resources. The two have to be different targets because
400 # targets which are common between the "instrumentation test apk" and the 400 # targets which are common between the "instrumentation test apk" and the
401 # "tested apk" are removed from the "instrumentation test apk". 401 # "tested apk" are removed from the "instrumentation test apk".
402 android_resources("cronet_sample_test_apk_resources") { 402 android_resources("cronet_sample_test_apk_resources") {
403 resource_dirs = [ "sample/res" ] 403 resource_dirs = [ "sample/res" ]
404 android_manifest = "sample/AndroidManifest.xml" 404 android_manifest = "sample/javatests/AndroidManifest.xml"
405 } 405 }
406 406
407 instrumentation_test_apk("cronet_sample_test_apk") { 407 instrumentation_test_apk("cronet_sample_test_apk") {
408 apk_name = "CronetSampleTest" 408 apk_name = "CronetSampleTest"
409 apk_under_test = ":cronet_sample_apk" 409 apk_under_test = ":cronet_sample_apk"
410 android_manifest = "sample/javatests/AndroidManifest.xml" 410 android_manifest = "sample/javatests/AndroidManifest.xml"
411 java_files = [ 411 java_files = [
412 "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java", 412 "sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java",
413 "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java", 413 "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java",
414 ] 414 ]
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 ":cronet_package_copy_native_lib", 920 ":cronet_package_copy_native_lib",
921 ":cronet_package_copy_native_lib_unstripped", 921 ":cronet_package_copy_native_lib_unstripped",
922 ":generate_javadoc", 922 ":generate_javadoc",
923 ":generate_licenses", 923 ":generate_licenses",
924 ":jar_cronet_api_source", 924 ":jar_cronet_api_source",
925 ":jar_cronet_other_source", 925 ":jar_cronet_other_source",
926 ":jar_cronet_sample_source", 926 ":jar_cronet_sample_source",
927 ":repackage_extracted_jars", 927 ":repackage_extracted_jars",
928 ] 928 ]
929 } 929 }
OLDNEW
« no previous file with comments | « no previous file | components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698