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

Side by Side Diff: net/net.gyp

Issue 1489403004: Remove default whitelist for grit on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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 | « ios/chrome/ios_today_extension_resources.gyp ('k') | ui/resources/ui_resources.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 { 680 {
681 'target_name': 'net_resources', 681 'target_name': 'net_resources',
682 'type': 'none', 682 'type': 'none',
683 'variables': { 683 'variables': {
684 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/net', 684 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/net',
685 }, 685 },
686 'actions': [ 686 'actions': [
687 { 687 {
688 'action_name': 'net_resources', 688 'action_name': 'net_resources',
689 'variables': { 689 'variables': {
690 'grit_whitelist': '',
691 'grit_grd_file': 'base/net_resources.grd', 690 'grit_grd_file': 'base/net_resources.grd',
692 }, 691 },
693 'includes': [ '../build/grit_action.gypi' ], 692 'includes': [ '../build/grit_action.gypi' ],
694 }, 693 },
695 ], 694 ],
696 }, 695 },
697 { 696 {
698 'target_name': 'net_extras', 697 'target_name': 'net_extras',
699 'type': 'static_library', 698 'type': 'static_library',
700 'variables': { 'enable_wexit_time_destructors': 1, }, 699 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1630 '../build/isolate.gypi', 1629 '../build/isolate.gypi',
1631 ], 1630 ],
1632 'sources': [ 1631 'sources': [
1633 'net_unittests.isolate', 1632 'net_unittests.isolate',
1634 ], 1633 ],
1635 }, 1634 },
1636 ], 1635 ],
1637 }], 1636 }],
1638 ], 1637 ],
1639 } 1638 }
OLDNEW
« no previous file with comments | « ios/chrome/ios_today_extension_resources.gyp ('k') | ui/resources/ui_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698