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

Side by Side Diff: build/all.gyp

Issue 836023006: Fix broken iOS skia test and make sure it is compiled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 11 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 | « no previous file | skia/ext/skia_utils_ios_unittest.mm » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'dependencies': [ 45 'dependencies': [
46 '../chrome/chrome.gyp:browser', 46 '../chrome/chrome.gyp:browser',
47 '../chrome/chrome.gyp:browser_ui', 47 '../chrome/chrome.gyp:browser_ui',
48 '../ios/ios.gyp:*', 48 '../ios/ios.gyp:*',
49 # NOTE: This list of targets is present because 49 # NOTE: This list of targets is present because
50 # mojo_base.gyp:mojo_base cannot be built on iOS, as 50 # mojo_base.gyp:mojo_base cannot be built on iOS, as
51 # javascript-related targets cause v8 to be built. 51 # javascript-related targets cause v8 to be built.
52 '../mojo/mojo_base.gyp:mojo_common_lib', 52 '../mojo/mojo_base.gyp:mojo_common_lib',
53 '../mojo/mojo_base.gyp:mojo_common_unittests', 53 '../mojo/mojo_base.gyp:mojo_common_unittests',
54 '../google_apis/google_apis.gyp:google_apis_unittests', 54 '../google_apis/google_apis.gyp:google_apis_unittests',
55 '../skia/skia_tests.gyp:skia_unittests',
55 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 56 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
56 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittes ts', 57 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittes ts',
57 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unit tests', 58 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unit tests',
58 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests ', 59 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests ',
59 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests ', 60 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests ',
60 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittest s', 61 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittest s',
61 '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests', 62 '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
62 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 63 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
63 '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils', 64 '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
64 '../third_party/mojo/mojo_public.gyp:mojo_system', 65 '../third_party/mojo/mojo_public.gyp:mojo_system',
(...skipping 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1404 'dependencies': [ 1405 'dependencies': [
1405 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1406 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1406 '../ui/views/views.gyp:views', 1407 '../ui/views/views.gyp:views',
1407 '../ui/views/views.gyp:views_unittests', 1408 '../ui/views/views.gyp:views_unittests',
1408 ], 1409 ],
1409 }, # target_name: macviews_builder 1410 }, # target_name: macviews_builder
1410 ], # targets 1411 ], # targets
1411 }], # os=='mac' and toolkit_views==1 1412 }], # os=='mac' and toolkit_views==1
1412 ], # conditions 1413 ], # conditions
1413 } 1414 }
OLDNEW
« no previous file with comments | « no previous file | skia/ext/skia_utils_ios_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698