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

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

Issue 1851423003: Make Web Push use InstanceID tokens instead of GCM registrations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid4default
Patch Set: Rebase (main conflics in browsertest and PMMF) Created 4 years, 7 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
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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//chrome/chrome_tests.gni") 10 import("//chrome/chrome_tests.gni")
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 } 1765 }
1766 1766
1767 if (is_android) { 1767 if (is_android) {
1768 sources += rebase_path( 1768 sources += rebase_path(
1769 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s, 1769 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s,
1770 ".", 1770 ".",
1771 "//chrome") 1771 "//chrome")
1772 sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ] 1772 sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ]
1773 deps += [ 1773 deps += [
1774 ":unit_tests_java", 1774 ":unit_tests_java",
1775 "//components/gcm_driver/instance_id/android:instance_id_driver_java",
1776 "//components/gcm_driver/instance_id/android:instance_id_driver_test_suppo rt_java",
1775 "//components/offline_pages:test_support", 1777 "//components/offline_pages:test_support",
1776 "//v8:v8_external_startup_data_assets", 1778 "//v8:v8_external_startup_data_assets",
1777 google_play_services_resources, 1779 google_play_services_resources,
1778 ] 1780 ]
1779 deps -= [ "//third_party/libaddressinput" ] 1781 deps -= [ "//third_party/libaddressinput" ]
1780 1782
1781 android_manifest = 1783 android_manifest =
1782 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1784 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1783 enable_multidex = true 1785 enable_multidex = true
1784 1786
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 if (is_android) { 2385 if (is_android) {
2384 android_library("unit_tests_java") { 2386 android_library("unit_tests_java") {
2385 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2387 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2386 deps = [ 2388 deps = [
2387 "//base:base_java", 2389 "//base:base_java",
2388 "//chrome/android:chrome_java", 2390 "//chrome/android:chrome_java",
2389 "//content/public/android:content_java", 2391 "//content/public/android:content_java",
2390 ] 2392 ]
2391 } 2393 }
2392 } 2394 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698