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

Side by Side Diff: talk/libjingle_examples.gyp

Issue 1214113015: Update AppRTCDemo resolution for iPhone6/6+ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix names Created 5 years, 5 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
« no previous file with comments | « talk/examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png ('k') | 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 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 'target_name': 'AppRTCDemo', 215 'target_name': 'AppRTCDemo',
216 'type': 'executable', 216 'type': 'executable',
217 'product_name': 'AppRTCDemo', 217 'product_name': 'AppRTCDemo',
218 'mac_bundle': 1, 218 'mac_bundle': 1,
219 'dependencies': [ 219 'dependencies': [
220 'apprtc_signaling', 220 'apprtc_signaling',
221 ], 221 ],
222 'conditions': [ 222 'conditions': [
223 ['OS=="ios"', { 223 ['OS=="ios"', {
224 'mac_bundle_resources': [ 224 'mac_bundle_resources': [
225 'examples/objc/AppRTCDemo/ios/resources/Default-568h.png', 225 'examples/objc/AppRTCDemo/ios/resources/iPhone5@2x.png',
226 'examples/objc/AppRTCDemo/ios/resources/iPhone6@2x.png',
227 'examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png',
226 'examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf', 228 'examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf',
227 'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.p ng', 229 'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.p ng',
228 'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2 x.png', 230 'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2 x.png',
229 'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png' , 231 'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png' ,
230 'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.p ng', 232 'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.p ng',
231 'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24 dp.png', 233 'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24 dp.png',
232 'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24 dp@2x.png', 234 'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24 dp@2x.png',
233 'examples/objc/Icon.png', 235 'examples/objc/Icon.png',
234 ], 236 ],
235 'sources': [ 237 'sources': [
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 'apk_name': 'AppRTCDemoTest', 377 'apk_name': 'AppRTCDemoTest',
376 'java_in_dir': 'examples/androidtests', 378 'java_in_dir': 'examples/androidtests',
377 'is_test_apk': 1, 379 'is_test_apk': 1,
378 }, 380 },
379 'includes': [ '../build/java_apk.gypi' ], 381 'includes': [ '../build/java_apk.gypi' ],
380 }, 382 },
381 ], # targets 383 ], # targets
382 }], # OS=="android" 384 }], # OS=="android"
383 ], 385 ],
384 } 386 }
OLDNEW
« no previous file with comments | « talk/examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698