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

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

Issue 2148293003: Excluded non-chromeos source files in chromeos build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed failed test Created 4 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 | « chrome/chrome_tests.gypi ('k') | 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 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 } 1137 }
1138 if (use_aura || toolkit_views) { 1138 if (use_aura || toolkit_views) {
1139 deps += [ "//ui/events:test_support" ] 1139 deps += [ "//ui/events:test_support" ]
1140 } 1140 }
1141 if (toolkit_views) { 1141 if (toolkit_views) {
1142 sources += rebase_path( 1142 sources += rebase_path(
1143 chrome_tests_gypi_values.chrome_browser_tests_views_sources, 1143 chrome_tests_gypi_values.chrome_browser_tests_views_sources,
1144 ".", 1144 ".",
1145 "//chrome") 1145 "//chrome")
1146 deps += [ "//ui/views" ] 1146 deps += [ "//ui/views" ]
1147 if (!is_chromeos && (!is_mac || mac_views_browser)) {
1148 sources += rebase_path(
1149 chrome_tests_gypi_values.chrome_browser_tests_views_non_cros_sou rces,
1150 ".",
1151 "//chrome")
1152 }
1147 if (!is_mac) { 1153 if (!is_mac) {
1148 sources += rebase_path( 1154 sources += rebase_path(
1149 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour ces, 1155 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour ces,
1150 ".", 1156 ".",
1151 "//chrome") 1157 "//chrome")
1152 if (!is_chromeos) {
1153 sources += rebase_path(
1154 chrome_tests_gypi_values.chrome_browser_tests_views_non_cros_o r_mac_sources,
1155 ".",
1156 "//chrome")
1157 }
1158 } 1158 }
1159 } 1159 }
1160 1160
1161 if (is_linux && !is_component_build) { 1161 if (is_linux && !is_component_build) {
1162 # Set rpath to find the CDM adapter even in a non-component build. 1162 # Set rpath to find the CDM adapter even in a non-component build.
1163 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] 1163 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
1164 } 1164 }
1165 1165
1166 if (is_chromeos) { 1166 if (is_chromeos) {
1167 sources += rebase_path( 1167 sources += rebase_path(
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
2467 if (is_android) { 2467 if (is_android) {
2468 android_library("unit_tests_java") { 2468 android_library("unit_tests_java") {
2469 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2469 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2470 deps = [ 2470 deps = [
2471 "//base:base_java", 2471 "//base:base_java",
2472 "//chrome/android:chrome_java", 2472 "//chrome/android:chrome_java",
2473 "//content/public/android:content_java", 2473 "//content/public/android:content_java",
2474 ] 2474 ]
2475 } 2475 }
2476 } 2476 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698