| OLD | NEW |
| 1 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved. | 1 # Copyright (c) 2012 The WebRTC Project Authors. All rights reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 { | 8 { |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['OS=="linux" or OS=="win"', { | 10 ['OS=="linux" or OS=="win"', { |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 ['OS=="mac"', { | 366 ['OS=="mac"', { |
| 367 'xcode_settings': { | 367 'xcode_settings': { |
| 368 # SocketRocket autosynthesizes some properties. Disable the | 368 # SocketRocket autosynthesizes some properties. Disable the |
| 369 # warning so we can compile successfully. | 369 # warning so we can compile successfully. |
| 370 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO', | 370 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO', |
| 371 'MACOSX_DEPLOYMENT_TARGET' : '10.8', | 371 'MACOSX_DEPLOYMENT_TARGET' : '10.8', |
| 372 # SRWebSocket.m uses code with partial availability. | 372 # SRWebSocket.m uses code with partial availability. |
| 373 # https://code.google.com/p/webrtc/issues/detail?id=4695 | 373 # https://code.google.com/p/webrtc/issues/detail?id=4695 |
| 374 'WARNING_CFLAGS!': [ | 374 'WARNING_CFLAGS!': [ |
| 375 '-Wpartial-availability', | 375 '-Wpartial-availability', |
| 376 # Hide the warning for SecRandomCopyBytes(), till we update | 376 ], |
| 377 # to upstream. | |
| 378 # https://bugs.chromium.org/p/webrtc/issues/detail?id=6396 | |
| 379 '-Wno-unused-result'], | |
| 380 }, | 377 }, |
| 381 }], | 378 }], |
| 382 ], | 379 ], |
| 383 'direct_dependent_settings': { | 380 'direct_dependent_settings': { |
| 384 'include_dirs': [ | 381 'include_dirs': [ |
| 385 'examples/objc/AppRTCDemo/third_party/SocketRocket', | 382 'examples/objc/AppRTCDemo/third_party/SocketRocket', |
| 386 ], | 383 ], |
| 387 }, | 384 }, |
| 388 'xcode_settings': { | 385 'xcode_settings': { |
| 389 'CLANG_ENABLE_OBJC_ARC': 'YES', | 386 'CLANG_ENABLE_OBJC_ARC': 'YES', |
| 390 'WARNING_CFLAGS': [ | 387 'WARNING_CFLAGS': [ |
| 391 '-Wno-deprecated-declarations', | 388 '-Wno-deprecated-declarations', |
| 392 '-Wno-nonnull', | 389 '-Wno-nonnull', |
| 390 # Hide the warning for SecRandomCopyBytes(), till we update |
| 391 # to upstream. |
| 392 # https://bugs.chromium.org/p/webrtc/issues/detail?id=6396 |
| 393 '-Wno-unused-result', |
| 393 ], | 394 ], |
| 394 }, | 395 }, |
| 395 'link_settings': { | 396 'link_settings': { |
| 396 'xcode_settings': { | 397 'xcode_settings': { |
| 397 'OTHER_LDFLAGS': [ | 398 'OTHER_LDFLAGS': [ |
| 398 '-framework CFNetwork', | 399 '-framework CFNetwork', |
| 399 '-licucore', | 400 '-licucore', |
| 400 ], | 401 ], |
| 401 }, | 402 }, |
| 402 } | 403 } |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 }, | 462 }, |
| 462 'includes': [ | 463 'includes': [ |
| 463 '../build/java_apk.gypi', | 464 '../build/java_apk.gypi', |
| 464 '../build/android/test_runner.gypi', | 465 '../build/android/test_runner.gypi', |
| 465 ], | 466 ], |
| 466 }, | 467 }, |
| 467 ], # targets | 468 ], # targets |
| 468 }], # OS=="android" | 469 }], # OS=="android" |
| 469 ], | 470 ], |
| 470 } | 471 } |
| OLD | NEW |