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

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

Issue 1495323002: Fix unit_tests crash on start-up for GN Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 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 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 ldflags = [ "-Wl,--gc-sections" ] 1660 ldflags = [ "-Wl,--gc-sections" ]
1661 } else { 1661 } else {
1662 sources += rebase_path( 1662 sources += rebase_path(
1663 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources, 1663 chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
1664 ".", 1664 ".",
1665 "//chrome") 1665 "//chrome")
1666 sources -= 1666 sources -=
1667 [ "../browser/download/download_request_infobar_delegate_unittest.cc" ] 1667 [ "../browser/download/download_request_infobar_delegate_unittest.cc" ]
1668 } 1668 }
1669 1669
1670 if (!is_android && !is_ios) { 1670 if (!is_ios) {
1671 deps += [ ":unit_tests_js" ] 1671 deps += [ ":unit_tests_js" ]
1672 sources += rebase_path( 1672 if (!is_android) {
1673 chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources, 1673 sources += rebase_path(
1674 ".", 1674 chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources ,
1675 "//chrome") 1675 ".",
1676 "//chrome")
1677 }
1676 } 1678 }
1677 1679
1678 if (is_ios || is_chromeos) { 1680 if (is_ios || is_chromeos) {
1679 sources -= [ "../browser/signin/chrome_signin_status_metrics_provider_delega te_unittest.cc" ] 1681 sources -= [ "../browser/signin/chrome_signin_status_metrics_provider_delega te_unittest.cc" ]
1680 } 1682 }
1681 if (enable_background) { 1683 if (enable_background) {
1682 sources += rebase_path( 1684 sources += rebase_path(
1683 chrome_tests_unit_gypi_values.chrome_unit_tests_background_sources, 1685 chrome_tests_unit_gypi_values.chrome_unit_tests_background_sources,
1684 ".", 1686 ".",
1685 "//chrome") 1687 "//chrome")
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
2234 if (is_android) { 2236 if (is_android) {
2235 android_library("unit_tests_java") { 2237 android_library("unit_tests_java") {
2236 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" 2238 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
2237 deps = [ 2239 deps = [
2238 "//base:base_java", 2240 "//base:base_java",
2239 "//chrome/android:chrome_java", 2241 "//chrome/android:chrome_java",
2240 "//content/public/android:content_java", 2242 "//content/public/android:content_java",
2241 ] 2243 ]
2242 } 2244 }
2243 } 2245 }
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