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

Side by Side Diff: build/all.gyp

Issue 198973004: Add chromium_builder_nacl_sdk target to all.gyp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 # 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 'conditions': [ 687 'conditions': [
688 ['chrome_multiple_dll==1', { 688 ['chrome_multiple_dll==1', {
689 'dependencies': [ 689 'dependencies': [
690 '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy', 690 '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy',
691 ], 691 ],
692 }], 692 }],
693 ], 693 ],
694 }], 694 }],
695 ], 695 ],
696 }, 696 },
697 {
698 'target_name': 'chromium_builder_nacl_sdk',
699 'type': 'none',
700 'dependencies': [
701 '../chrome/chrome.gyp:chrome',
702 ],
703 'conditions': [
704 ['OS=="win"', {
705 'dependencies': [
706 '../chrome/chrome.gyp:chrome_nacl_win64',
707 ]
708 }],
709 ],
710 }, #target_name: chromium_builder_nacl_sdk
697 ], # targets 711 ], # targets
698 }], #OS!=ios and OS!=android 712 }], #OS!=ios and OS!=android
699 ['OS=="android"', { 713 ['OS=="android"', {
700 'targets': [ 714 'targets': [
701 { 715 {
702 # The current list of tests for android. This is temporary 716 # The current list of tests for android. This is temporary
703 # until the full set supported. If adding a new test here, 717 # until the full set supported. If adding a new test here,
704 # please also add it to build/android/pylib/gtest/gtest_config.py, 718 # please also add it to build/android/pylib/gtest/gtest_config.py,
705 # else the test is not run. 719 # else the test is not run.
706 # 720 #
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 # http://crbug.com/157234 1243 # http://crbug.com/157234
1230 #'../chrome/chrome.gyp:sync_integration_tests_run', 1244 #'../chrome/chrome.gyp:sync_integration_tests_run',
1231 '../chrome/chrome.gyp:unit_tests_run', 1245 '../chrome/chrome.gyp:unit_tests_run',
1232 '../net/net.gyp:net_unittests_run', 1246 '../net/net.gyp:net_unittests_run',
1233 ], 1247 ],
1234 }, # target_name: chromium_swarm_tests 1248 }, # target_name: chromium_swarm_tests
1235 ], 1249 ],
1236 }], 1250 }],
1237 ], # conditions 1251 ], # conditions
1238 } 1252 }
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