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

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 (remove force_subtype_for_app_id) Created 4 years, 3 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 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after
1856 } 1856 }
1857 1857
1858 if (is_android) { 1858 if (is_android) {
1859 sources += rebase_path( 1859 sources += rebase_path(
1860 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s, 1860 chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_source s,
1861 ".", 1861 ".",
1862 "//chrome") 1862 "//chrome")
1863 sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ] 1863 sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ]
1864 deps += [ 1864 deps += [
1865 ":unit_tests_java", 1865 ":unit_tests_java",
1866 "//components/gcm_driver/instance_id/android:instance_id_driver_java",
1867 "//components/gcm_driver/instance_id/android:instance_id_driver_test_suppo rt_java",
1866 "//components/offline_pages:test_support", 1868 "//components/offline_pages:test_support",
1867 "//v8:v8_external_startup_data_assets", 1869 "//v8:v8_external_startup_data_assets",
1868 ] 1870 ]
1869 deps -= [ "//third_party/libaddressinput" ] 1871 deps -= [ "//third_party/libaddressinput" ]
1870 1872
1871 android_manifest = 1873 android_manifest =
1872 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml" 1874 "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
1873 enable_multidex = true 1875 enable_multidex = true
1874 1876
1875 # Some android targets still depend on --gc-sections to link. 1877 # Some android targets still depend on --gc-sections to link.
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2462 if (is_android) { 2464 if (is_android) {
2463 android_library("unit_tests_java") { 2465 android_library("unit_tests_java") {
2464 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2466 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2465 deps = [ 2467 deps = [
2466 "//base:base_java", 2468 "//base:base_java",
2467 "//chrome/android:chrome_java", 2469 "//chrome/android:chrome_java",
2468 "//content/public/android:content_java", 2470 "//content/public/android:content_java",
2469 ] 2471 ]
2470 } 2472 }
2471 } 2473 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698