OLD | NEW |
1 # | 1 # |
2 # libjingle | 2 # libjingle |
3 # Copyright 2014 Google Inc. | 3 # Copyright 2014 Google Inc. |
4 # | 4 # |
5 # Redistribution and use in source and binary forms, with or without | 5 # Redistribution and use in source and binary forms, with or without |
6 # modification, are permitted provided that the following conditions are met: | 6 # modification, are permitted provided that the following conditions are met: |
7 # | 7 # |
8 # 1. Redistributions of source code must retain the above copyright notice, | 8 # 1. Redistributions of source code must retain the above copyright notice, |
9 # this list of conditions and the following disclaimer. | 9 # this list of conditions and the following disclaimer. |
10 # 2. Redistributions in binary form must reproduce the above copyright notice, | 10 # 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 14 matching lines...) Expand all Loading... |
25 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 # | 26 # |
27 | 27 |
28 # Include this .gypi in an ObjC target's definition to allow it to be | 28 # Include this .gypi in an ObjC target's definition to allow it to be |
29 # used as an iOS or OS/X application. | 29 # used as an iOS or OS/X application. |
30 | 30 |
31 { | 31 { |
32 'variables': { | 32 'variables': { |
33 'infoplist_file': './objc_app.plist', | 33 'infoplist_file': './objc_app.plist', |
34 }, | 34 }, |
| 35 'dependencies': [ |
| 36 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', |
| 37 ], |
35 'mac_bundle': 1, | 38 'mac_bundle': 1, |
36 'mac_bundle_resources': [ | 39 'mac_bundle_resources': [ |
37 '<(infoplist_file)', | 40 '<(infoplist_file)', |
38 ], | 41 ], |
39 # The plist is listed above so that it appears in XCode's file list, | 42 # The plist is listed above so that it appears in XCode's file list, |
40 # but we don't actually want to bundle it. | 43 # but we don't actually want to bundle it. |
41 'mac_bundle_resources!': [ | 44 'mac_bundle_resources!': [ |
42 '<(infoplist_file)', | 45 '<(infoplist_file)', |
43 ], | 46 ], |
44 'xcode_settings': { | 47 'xcode_settings': { |
45 'CLANG_ENABLE_OBJC_ARC': 'YES', | 48 'CLANG_ENABLE_OBJC_ARC': 'YES', |
46 'INFOPLIST_FILE': '<(infoplist_file)', | 49 'INFOPLIST_FILE': '<(infoplist_file)', |
47 }, | 50 }, |
48 } | 51 } |
OLD | NEW |