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

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

Issue 1533353002: GN: asset_location -> android_assets() for cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | no next file » | 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/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 import("//build/util/version.gni") 6 import("//build/util/version.gni")
7 import("//chrome/version.gni") 7 import("//chrome/version.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 assert(!is_component_build, "Cronet requires static library build.") 10 assert(!is_component_build, "Cronet requires static library build.")
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 DEPRECATED_java_in_dir = "test/src" 402 DEPRECATED_java_in_dir = "test/src"
403 403
404 deps = [ 404 deps = [
405 ":cronet_api", 405 ":cronet_api",
406 ":cronet_java", 406 ":cronet_java",
407 "//base:base_java", 407 "//base:base_java",
408 "//net/android:net_java_test_support", 408 "//net/android:net_java_test_support",
409 ] 409 ]
410 } 410 }
411 411
412 android_assets("cronet_test_apk_assets") {
413 sources = [
414 "test/assets/test",
mef 2015/12/21 16:50:14 according to https://code.google.com/p/chromium/co
agrieve 2015/12/21 17:58:10 Right you are! Fixed.
415 ]
416 }
417
412 android_apk("cronet_test_apk") { 418 android_apk("cronet_test_apk") {
413 testonly = true 419 testonly = true
414 apk_name = "CronetTest" 420 apk_name = "CronetTest"
415 android_manifest = "test/AndroidManifest.xml" 421 android_manifest = "test/AndroidManifest.xml"
416 native_libs = [ "libcronet_tests.so" ] 422 native_libs = [ "libcronet_tests.so" ]
417 asset_location = "test/assets"
418 423
419 deps = [ 424 deps = [
425 ":cronet_test_apk_assets",
420 ":cronet_test_apk_java", 426 ":cronet_test_apk_java",
421 ":cronet_test_apk_resources", 427 ":cronet_test_apk_resources",
422 ":cronet_tests", 428 ":cronet_tests",
423 "//base:base_java", 429 "//base:base_java",
424 ] 430 ]
425 431
426 run_findbugs = true 432 run_findbugs = true
427 } 433 }
428 434
429 instrumentation_test_apk("cronet_test_instrumentation_apk") { 435 instrumentation_test_apk("cronet_test_instrumentation_apk") {
(...skipping 24 matching lines...) Expand all
454 460
455 deps = [ 461 deps = [
456 ":cronet_static", 462 ":cronet_static",
457 "//base", 463 "//base",
458 "//base/test:test_support", 464 "//base/test:test_support",
459 "//components/metrics", 465 "//components/metrics",
460 "//net", 466 "//net",
461 "//testing/gtest", 467 "//testing/gtest",
462 ] 468 ]
463 } 469 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698