| OLD | NEW |
|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 3 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 # | 6 # |
| 7 | 7 |
| 8 # TODO(sehr): remove need for the warning flag removals below | 8 # TODO(sehr): remove need for the warning flag removals below |
| 9 { | 9 { |
| 10 'includes': [ | 10 'includes': [ |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 { | 57 { |
| 58 'target_name': 'nonnacl_util', | 58 'target_name': 'nonnacl_util', |
| 59 'type': 'static_library', | 59 'type': 'static_library', |
| 60 'dependencies': [ | 60 'dependencies': [ |
| 61 'sel_ldr_launcher', | 61 'sel_ldr_launcher', |
| 62 ], | 62 ], |
| 63 'includes': [ | 63 'includes': [ |
| 64 'nonnacl_util.gypi', | 64 'nonnacl_util.gypi', |
| 65 ], | 65 ], |
| 66 }, | 66 }, |
| 67 # ---------------------------------------------------------------- |
| 68 { |
| 69 'target_name': 'nonnacl_util_chrome', |
| 70 'type': 'static_library', |
| 71 'dependencies': [ |
| 72 'sel_ldr_launcher', |
| 73 ], |
| 74 }, |
| 67 ], | 75 ], |
| 68 # ---------------------------------------------------------------------- | 76 # ---------------------------------------------------------------------- |
| 69 'conditions': [ | 77 'conditions': [ |
| 70 ['OS=="win"', { | 78 ['OS=="win"', { |
| 71 'targets': [ | 79 'targets': [ |
| 72 # -------------------------------------------------------------------- | 80 # -------------------------------------------------------------------- |
| 73 { | 81 { |
| 74 'target_name': 'sel_ldr_launcher64', | 82 'target_name': 'sel_ldr_launcher64', |
| 75 'type': 'static_library', | 83 'type': 'static_library', |
| 76 'variables': { | 84 'variables': { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 89 'variables': { | 97 'variables': { |
| 90 'win_target': 'x64', | 98 'win_target': 'x64', |
| 91 }, | 99 }, |
| 92 'dependencies': [ | 100 'dependencies': [ |
| 93 'sel_ldr_launcher64', | 101 'sel_ldr_launcher64', |
| 94 ], | 102 ], |
| 95 'includes': [ | 103 'includes': [ |
| 96 'nonnacl_util.gypi', | 104 'nonnacl_util.gypi', |
| 97 ], | 105 ], |
| 98 }, | 106 }, |
| 99 ], | |
| 100 }], | |
| 101 ['nacl_standalone==0', { | |
| 102 'targets': [ | |
| 103 # ---------------------------------------------------------------- | |
| 104 { | |
| 105 'target_name': 'nonnacl_util_chrome', | |
| 106 'type': 'static_library', | |
| 107 'dependencies': [ | |
| 108 'sel_ldr_launcher', | |
| 109 ], | |
| 110 }, | |
| 111 ], | |
| 112 }], | |
| 113 ['OS=="win" and nacl_standalone==0', { | |
| 114 'targets': [ | |
| 115 # ---------------------------------------------------------------- | 107 # ---------------------------------------------------------------- |
| 116 { | 108 { |
| 117 'target_name': 'nonnacl_util_chrome64', | 109 'target_name': 'nonnacl_util_chrome64', |
| 118 'type': 'static_library', | 110 'type': 'static_library', |
| 119 'variables': { | 111 'variables': { |
| 120 'win_target': 'x64', | 112 'win_target': 'x64', |
| 121 }, | 113 }, |
| 122 'dependencies': [ | 114 'dependencies': [ |
| 123 'sel_ldr_launcher64', | 115 'sel_ldr_launcher64', |
| 124 ], | 116 ], |
| 125 }, | 117 }, |
| 126 ], | 118 ], |
| 127 }], | 119 }], |
| 128 ], | 120 ], |
| 129 } | 121 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10831270:
Eliminate build differences in nacl gated on nacl_standalone.
Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client