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

Side by Side Diff: public/all.gyp

Issue 1121753003: Add blink_test_binaries target. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rm the gn part 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 | Annotate | Revision Log
« 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 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 'targets': [ 34 'targets': [
35 { 35 {
36 # GN version: //third_party/WebKit/public:all_blink 36 # GN version: //third_party/WebKit/public:all_blink
37 'target_name': 'all_blink', 37 'target_name': 'all_blink',
38 'type': 'none', 38 'type': 'none',
39 'dependencies': [ 39 'dependencies': [
40 'blink_tests', 40 'blink_tests',
41 ], 41 ],
42 }, 42 },
43 { 43 {
44 'target_name': 'blink_unittests',
45 'type': 'none',
46 'dependencies': [
47 'blink_tests',
48 ],
49 },
50 {
51 # TODO(tfarina): Update Chromium to use blink_test_binaries and then
52 # remove this. crbug.com/483171
44 # GN version: //third_party/WebKit/public:blink_tests 53 # GN version: //third_party/WebKit/public:blink_tests
45 'target_name': 'blink_tests', 54 'target_name': 'blink_tests',
46 'type': 'none', 55 'type': 'none',
47 'dependencies': [ 56 'dependencies': [
48 '../Source/platform/blink_platform_tests.gyp:blink_heap_unittest s', 57 '../Source/platform/blink_platform_tests.gyp:blink_heap_unittest s',
49 '../Source/platform/blink_platform_tests.gyp:blink_platform_unit tests', 58 '../Source/platform/blink_platform_tests.gyp:blink_platform_unit tests',
50 '../Source/web/web_tests.gyp:webkit_unit_tests', 59 '../Source/web/web_tests.gyp:webkit_unit_tests',
51 '../Source/wtf/wtf_tests.gyp:wtf_unittests', 60 '../Source/wtf/wtf_tests.gyp:wtf_unittests',
52 ], 61 ],
53 'conditions': [ 62 'conditions': [
54 ['OS=="android"', { 63 ['OS=="android"', {
55 'dependencies': [ 64 'dependencies': [
56 '../Source/platform/blink_platform_tests.gyp:blink_heap_ unittests_apk', 65 '../Source/platform/blink_platform_tests.gyp:blink_heap_ unittests_apk',
57 '../Source/platform/blink_platform_tests.gyp:blink_platf orm_unittests_apk', 66 '../Source/platform/blink_platform_tests.gyp:blink_platf orm_unittests_apk',
58 '../Source/web/web_tests.gyp:webkit_unit_tests_apk', 67 '../Source/web/web_tests.gyp:webkit_unit_tests_apk',
59 '../Source/wtf/wtf_tests.gyp:wtf_unittests_apk', 68 '../Source/wtf/wtf_tests.gyp:wtf_unittests_apk',
60 ], 69 ],
61 }], 70 }],
62 ], 71 ],
63 }, 72 },
64 ], 73 ],
65 } 74 }
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