| 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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 ], | 364 ], |
| 365 'conditions': [ | 365 'conditions': [ |
| 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!': ['-Wpartial-availability'], | 374 'WARNING_CFLAGS!': [ |
| 375 '-Wpartial-availability', |
| 376 # Hide the warning for SecRandomCopyBytes(), till we update |
| 377 # to upstream. |
| 378 # https://bugs.chromium.org/p/webrtc/issues/detail?id=6396 |
| 379 '-Wno-unused-result'], |
| 375 }, | 380 }, |
| 376 }], | 381 }], |
| 377 ], | 382 ], |
| 378 'direct_dependent_settings': { | 383 'direct_dependent_settings': { |
| 379 'include_dirs': [ | 384 'include_dirs': [ |
| 380 'examples/objc/AppRTCDemo/third_party/SocketRocket', | 385 'examples/objc/AppRTCDemo/third_party/SocketRocket', |
| 381 ], | 386 ], |
| 382 }, | 387 }, |
| 383 'xcode_settings': { | 388 'xcode_settings': { |
| 384 'CLANG_ENABLE_OBJC_ARC': 'YES', | 389 'CLANG_ENABLE_OBJC_ARC': 'YES', |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 456 }, | 461 }, |
| 457 'includes': [ | 462 'includes': [ |
| 458 '../build/java_apk.gypi', | 463 '../build/java_apk.gypi', |
| 459 '../build/android/test_runner.gypi', | 464 '../build/android/test_runner.gypi', |
| 460 ], | 465 ], |
| 461 }, | 466 }, |
| 462 ], # targets | 467 ], # targets |
| 463 }], # OS=="android" | 468 }], # OS=="android" |
| 464 ], | 469 ], |
| 465 } | 470 } |
| OLD | NEW |