Merge 663413002 to M39:

content/content_tests.gypi

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 820 matching lines @@
           ],
         }],
         ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
           'sources': [
             'browser/media/capture/desktop_capture_device_unittest.cc',
           ],
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
         }],
+        ['enable_webrtc==1 and OS=="mac"', {
+          'variables': {
+            'libpeer_target_type%': 'static_library',
+          },
+          'conditions': [
+            ['libpeer_target_type!="static_library"', {
+              'copies': [{
+                'destination': '<(PRODUCT_DIR)/Libraries',
+                'files': [
+                  '<(PRODUCT_DIR)/libpeerconnection.so',
+                ],
+              }],
+            }],
+          ],
+        }],
         ['enable_webrtc==1 and chromeos==1', {
           'sources': [
             'browser/media/capture/desktop_capture_device_aura_unittest.cc',
           ],
         }],
         # TODO(jrg): remove the OS=="android" section?
         # http://crbug.com/113172
         # Understand better how media_stream_ is tied into Chromium.
         ['enable_webrtc==0 and OS=="android"', {
           'sources/': [
@@ skipping 1066 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }