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

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

Issue 949233003: Fix official build in GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@random
Patch Set: remove ppapi dep Created 5 years, 9 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/common/BUILD.gn ('k') | chrome/version.gni » ('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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 if (enable_supervised_users) { 952 if (enable_supervised_users) {
953 sources += 953 sources +=
954 rebase_path(gypi_values.chrome_browser_tests_supervised_user_sources, 954 rebase_path(gypi_values.chrome_browser_tests_supervised_user_sources,
955 ".", 955 ".",
956 "//chrome") 956 "//chrome")
957 } 957 }
958 if (enable_pepper_cdms) { 958 if (enable_pepper_cdms) {
959 # Runtime dependencies. 959 # Runtime dependencies.
960 data_deps += [ 960 data_deps += [
961 "//media/cdm/ppapi:clearkeycdmadapter", 961 "//media/cdm/ppapi:clearkeycdmadapter",
962 #'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', TOD O(GYP) 962 "//third_party/widevine/cdm:adapter",
963 ] 963 ]
964 } 964 }
965 if (!enable_print_preview) { 965 if (!enable_print_preview) {
966 sources -= [ 966 sources -= [
967 "../browser/extensions/api/cloud_print_private/cloud_print_private_apite st.cc", 967 "../browser/extensions/api/cloud_print_private/cloud_print_private_apite st.cc",
968 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc" , 968 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc" ,
969 "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsert est.cc", 969 "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsert est.cc",
970 "../browser/printing/print_preview_dialog_controller_browsertest.cc", 970 "../browser/printing/print_preview_dialog_controller_browsertest.cc",
971 "../browser/printing/print_preview_pdf_generated_browsertest.cc", 971 "../browser/printing/print_preview_pdf_generated_browsertest.cc",
972 "../browser/service_process/service_process_control_browsertest.cc", 972 "../browser/service_process/service_process_control_browsertest.cc",
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 "../browser/load_library_perf_test.cc", 1143 "../browser/load_library_perf_test.cc",
1144 ] 1144 ]
1145 1145
1146 deps = [ 1146 deps = [
1147 "//base/test:test_support_perf", 1147 "//base/test:test_support_perf",
1148 "//testing/gtest", 1148 "//testing/gtest",
1149 "//testing/perf", 1149 "//testing/perf",
1150 "//third_party/widevine/cdm:version_h", 1150 "//third_party/widevine/cdm:version_h",
1151 ] 1151 ]
1152 1152
1153 # TODO(GYP) CDM adapter stuff. 1153 if (enable_pepper_cdms) {
1154 #if (enable_pepper_cdms) { 1154 data_deps = [
1155 # deps += [ 1155 "//media/cdm/ppapi:clearkeycdmadapter",
1156 # "//media/cdm/ppapi:clearkeycdmadapter", 1156 "//third_party/widevine/cdm:adapter",
1157 # "//ppapi/cpp", 1157 ]
1158 # "//third_party/widevine/cdm:adapter", 1158 }
1159 # ]
1160 #}
1161 } 1159 }
1162 1160
1163 unit_gypi_values = exec_script("//build/gypi_to_gn.py", 1161 unit_gypi_values = exec_script("//build/gypi_to_gn.py",
1164 [ rebase_path("../chrome_tests_unit.gypi") ], 1162 [ rebase_path("../chrome_tests_unit.gypi") ],
1165 "scope", 1163 "scope",
1166 [ "../chrome_tests_unit.gypi" ]) 1164 [ "../chrome_tests_unit.gypi" ])
1167 1165
1168 test("unit_tests") { 1166 test("unit_tests") {
1169 sources = 1167 sources =
1170 rebase_path(unit_gypi_values.chrome_unit_tests_sources, ".", "//chrome") 1168 rebase_path(unit_gypi_values.chrome_unit_tests_sources, ".", "//chrome")
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
1667 } 1665 }
1668 if (use_ozone) { 1666 if (use_ozone) {
1669 # crbug.com/354036 1667 # crbug.com/354036
1670 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] 1668 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ]
1671 } 1669 }
1672 if (!enable_plugin_installation) { 1670 if (!enable_plugin_installation) {
1673 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] 1671 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ]
1674 } 1672 }
1675 } 1673 }
1676 } 1674 }
OLDNEW
« no previous file with comments | « chrome/common/BUILD.gn ('k') | chrome/version.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698