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

Side by Side Diff: components/BUILD.gn

Issue 1115033003: resources: Prevent including the same resource in multiple pack files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 5 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
« no previous file with comments | « chrome/test/base/javascript_browser_test.cc ('k') | components/components_tests.gyp » ('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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//tools/grit/repack.gni") 8 import("//tools/grit/repack.gni")
9 9
10 # Collection of all components. You wouldn't link to this, but this is rather 10 # Collection of all components. You wouldn't link to this, but this is rather
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 "//components/web_resource:unit_tests", 291 "//components/web_resource:unit_tests",
292 "//components/webcrypto:unit_tests", 292 "//components/webcrypto:unit_tests",
293 "//components/webdata/common:unit_tests", 293 "//components/webdata/common:unit_tests",
294 294
295 # These are the deps required by the code in this target. 295 # These are the deps required by the code in this target.
296 "//base", 296 "//base",
297 "//base/test:test_support", 297 "//base/test:test_support",
298 "//content/test:test_support", 298 "//content/test:test_support",
299 "//net", 299 "//net",
300 "//ui/base", 300 "//ui/base",
301 "//ui/resources:ui_test_pak",
301 ] 302 ]
302 data_deps = [ ":components_tests_pak" ] 303 data_deps = [ ":components_tests_pak" ]
303 304
304 if (!is_android && !is_ios) { 305 if (!is_android && !is_ios) {
305 deps += [ "//components/proximity_auth:unit_tests" ] 306 deps += [ "//components/proximity_auth:unit_tests" ]
306 } 307 }
307 308
308 # TODO(GYP) need this target. 309 # TODO(GYP) need this target.
309 #'breakpad/app/crash_keys_win_unittest.cc', 310 #'breakpad/app/crash_keys_win_unittest.cc',
310 311
(...skipping 13 matching lines...) Expand all
324 325
325 if (!is_ios) { 326 if (!is_ios) {
326 deps += [ "//components/scheduler:unit_tests" ] 327 deps += [ "//components/scheduler:unit_tests" ]
327 } 328 }
328 } 329 }
329 330
330 repack("components_tests_pak") { 331 repack("components_tests_pak") {
331 sources = [ 332 sources = [
332 "$root_gen_dir/components/components_resources.pak", 333 "$root_gen_dir/components/components_resources.pak",
333 "$root_gen_dir/components/strings/components_strings_en-US.pak", 334 "$root_gen_dir/components/strings/components_strings_en-US.pak",
334 "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
335 "$root_gen_dir/ui/resources/webui_resources.pak",
336 "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
337 "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
338 ] 335 ]
339 336
340 output = "$root_out_dir/components_tests_resources.pak" 337 output = "$root_out_dir/components_tests_resources.pak"
341 338
342 deps = [ 339 deps = [
343 "//components/resources", 340 "//components/resources",
344 "//components/strings", 341 "//components/strings",
345 "//ui/resources",
346 "//ui/strings",
347 ] 342 ]
348 } 343 }
349 344
350 if (is_android) { 345 if (is_android) {
351 import("//build/config/android/rules.gni") 346 import("//build/config/android/rules.gni")
352 347
353 generate_jni("components_browsertests_jni_headers") { 348 generate_jni("components_browsertests_jni_headers") {
354 jni_package = "components_browsertests/shell" 349 jni_package = "components_browsertests/shell"
355 sources = [ 350 sources = [
356 "test/android/browsertests_apk/src/org/chromium/components_browsertests_ap k/ComponentsBrowserTestsActivity.java", 351 "test/android/browsertests_apk/src/org/chromium/components_browsertests_ap k/ComponentsBrowserTestsActivity.java",
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 424
430 deps = [ 425 deps = [
431 "//base", 426 "//base",
432 "//base/test:test_support_perf", 427 "//base/test:test_support_perf",
433 "//testing/gtest", 428 "//testing/gtest",
434 "//testing/perf", 429 "//testing/perf",
435 "//content/test:test_support", 430 "//content/test:test_support",
436 "//components/visitedlink/browser", 431 "//components/visitedlink/browser",
437 ] 432 ]
438 } 433 }
OLDNEW
« no previous file with comments | « chrome/test/base/javascript_browser_test.cc ('k') | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698