Chromium Code Reviews| 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 |
|
tkchin_webrtc
2016/03/14 23:22:10
ditto license
hjon_webrtc
2016/03/15 21:07:48
Done.
| |
| 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, |
| 11 # this list of conditions and the following disclaimer in the documentation | 11 # this list of conditions and the following disclaimer in the documentation |
| 12 # and/or other materials provided with the distribution. | 12 # and/or other materials provided with the distribution. |
| 13 # 3. The name of the author may not be used to endorse or promote products | 13 # 3. The name of the author may not be used to endorse or promote products |
| 14 # derived from this software without specific prior written permission. | 14 # derived from this software without specific prior written permission. |
| 15 # | 15 # |
| 16 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| 17 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 21 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 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': { |
|
tkchin_webrtc
2016/03/14 23:22:10
Can you see where objc_app.gypi is used? I would t
kjellander_webrtc
2016/03/15 04:03:10
Yepp it should break things unless updated:
$ git
hjon_webrtc
2016/03/15 21:07:48
Done.
| |
| 33 'infoplist_file': './objc_app.plist', | 33 'infoplist_file': './objc_app.plist', |
| 34 }, | 34 }, |
| 35 'dependencies': [ | 35 'dependencies': [ |
| 36 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', | 36 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', |
| 37 ], | 37 ], |
| 38 'mac_bundle': 1, | 38 'mac_bundle': 1, |
| 39 'mac_bundle_resources': [ | 39 'mac_bundle_resources': [ |
| 40 '<(infoplist_file)', | 40 '<(infoplist_file)', |
| 41 ], | 41 ], |
| 42 # 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, |
| 43 # but we don't actually want to bundle it. | 43 # but we don't actually want to bundle it. |
| 44 'mac_bundle_resources!': [ | 44 'mac_bundle_resources!': [ |
| 45 '<(infoplist_file)', | 45 '<(infoplist_file)', |
| 46 ], | 46 ], |
| 47 'xcode_settings': { | 47 'xcode_settings': { |
| 48 'CLANG_ENABLE_OBJC_ARC': 'YES', | 48 'CLANG_ENABLE_OBJC_ARC': 'YES', |
| 49 'INFOPLIST_FILE': '<(infoplist_file)', | 49 'INFOPLIST_FILE': '<(infoplist_file)', |
| 50 }, | 50 }, |
| 51 } | 51 } |
| OLD | NEW |