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

Side by Side Diff: chrome/android/BUILD.gn

Issue 1218053003: [Android] Begin switching from lighttpd + apache to EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « build/java_apk.gypi ('k') | chrome/android/chrome_apk.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 ] 479 ]
480 DEPRECATED_java_in_dir = "shell/javatests/src" 480 DEPRECATED_java_in_dir = "shell/javatests/src"
481 } 481 }
482 482
483 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk 483 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk
484 instrumentation_test_apk("chrome_shell_test_apk") { 484 instrumentation_test_apk("chrome_shell_test_apk") {
485 apk_under_test = ":chrome_shell_apk" 485 apk_under_test = ":chrome_shell_apk"
486 deps = [ 486 deps = [
487 ":chrome_javatests", 487 ":chrome_javatests",
488 ":chrome_shell_test_java", 488 ":chrome_shell_test_java",
489
490 # ChromeShellTest uses ChromePublicTest's native library.
491 ":chrome_public_test",
489 ] 492 ]
490 apk_name = "ChromeShellTest" 493 apk_name = "ChromeShellTest"
491 android_manifest = "shell/javatests/AndroidManifest.xml" 494 android_manifest = "shell/javatests/AndroidManifest.xml"
492 isolate_file = "../chrome_shell_test_apk.isolate" 495 isolate_file = "../chrome_shell_test_apk.isolate"
496 native_libs = [ "$root_build_dir/lib.stripped/libchrome_public_test.so" ]
493 } 497 }
494 498
495 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests 499 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
496 junit_binary("chrome_junit_tests") { 500 junit_binary("chrome_junit_tests") {
497 java_files = [ 501 java_files = [
498 "junit/src/org/chromium/chrome/browser/childaccounts/ChildAccountServiceTest .java", 502 "junit/src/org/chromium/chrome/browser/childaccounts/ChildAccountServiceTest .java",
499 "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.ja va", 503 "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.ja va",
500 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java", 504 "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
501 "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteContro llerTest.java", 505 "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteContro llerTest.java",
502 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav a", 506 "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.jav a",
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 ":chrome_java_resources", 721 ":chrome_java_resources",
718 ":chrome_public", 722 ":chrome_public",
719 ":chrome_public_apk_assets", 723 ":chrome_public_apk_assets",
720 ":chrome_public_apk_manifest", 724 ":chrome_public_apk_manifest",
721 ":chrome_public_template_resources", 725 ":chrome_public_template_resources",
722 "//base:base_java", 726 "//base:base_java",
723 "//third_party/android_tools:google_play_services_default_resources", 727 "//third_party/android_tools:google_play_services_default_resources",
724 ] 728 ]
725 } 729 }
726 730
731 shared_library("chrome_public_test") {
732 testonly = true
733 deps = [
734 "//net:test_support",
735 ]
736 sources = [
737 "../browser/android/chrome_test_entry_point.cc",
738 ]
739 }
740
727 chrome_public_test_apk_manifest = 741 chrome_public_test_apk_manifest =
728 "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml" 742 "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml"
729 743
730 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest 744 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest
731 jinja_template("chrome_public_test_apk_manifest") { 745 jinja_template("chrome_public_test_apk_manifest") {
732 input = "javatests/AndroidManifest.xml" 746 input = "javatests/AndroidManifest.xml"
733 output = chrome_public_test_apk_manifest 747 output = chrome_public_test_apk_manifest
734 variables = jinja_variables 748 variables = jinja_variables
735 } 749 }
736 750
737 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk 751 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
738 instrumentation_test_apk("chrome_public_test_apk") { 752 instrumentation_test_apk("chrome_public_test_apk") {
739 # TODO(GYP,cjhopman): Does this need version code/name? 753 # TODO(GYP,cjhopman): Does this need version code/name?
740 apk_name = "ChromePublicTest" 754 apk_name = "ChromePublicTest"
741 apk_under_test = ":chrome_public_apk" 755 apk_under_test = ":chrome_public_apk"
742 android_manifest = chrome_public_test_apk_manifest 756 android_manifest = chrome_public_test_apk_manifest
743 deps = [ 757 deps = [
758 ":chrome_public_test",
744 ":chrome_public_test_apk_manifest", 759 ":chrome_public_test_apk_manifest",
745 "//chrome/android:chrome_shared_test_java", 760 "//chrome/android:chrome_shared_test_java",
746 ] 761 ]
747 isolate_file = "../chrome_public_test_apk.isolate" 762 isolate_file = "../chrome_public_test_apk.isolate"
763 native_libs = [ "$root_build_dir/lib.stripped/libchrome_public_test.so" ]
748 } 764 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698