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

Side by Side Diff: content/content_tests.gypi

Issue 611493002: Revert of Reland 588523002: Fix the way how we create webrtc::AudioProcessing in Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « build/android/pylib/gtest/setup.py ('k') | content/content_unittests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 ], 831 ],
832 }], 832 }],
833 ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', { 833 ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
834 'sources': [ 834 'sources': [
835 'browser/media/capture/desktop_capture_device_unittest.cc', 835 'browser/media/capture/desktop_capture_device_unittest.cc',
836 ], 836 ],
837 'dependencies': [ 837 'dependencies': [
838 '../third_party/webrtc/modules/modules.gyp:desktop_capture', 838 '../third_party/webrtc/modules/modules.gyp:desktop_capture',
839 ], 839 ],
840 }], 840 }],
841 ['enable_webrtc==1 and OS=="mac"', {
842 'variables': {
843 'libpeer_target_type%': 'static_library',
844 },
845 'conditions': [
846 ['libpeer_target_type!="static_library"', {
847 'copies': [{
848 'destination': '<(PRODUCT_DIR)/Libraries',
849 'files': [
850 '<(PRODUCT_DIR)/libpeerconnection.so',
851 ],
852 }],
853 }],
854 ],
855 }],
856 ['enable_webrtc==1 and chromeos==1', { 841 ['enable_webrtc==1 and chromeos==1', {
857 'sources': [ 842 'sources': [
858 'browser/media/capture/desktop_capture_device_aura_unittest.cc', 843 'browser/media/capture/desktop_capture_device_aura_unittest.cc',
859 ], 844 ],
860 }], 845 }],
861 # TODO(jrg): remove the OS=="android" section? 846 # TODO(jrg): remove the OS=="android" section?
862 # http://crbug.com/113172 847 # http://crbug.com/113172
863 # Understand better how media_stream_ is tied into Chromium. 848 # Understand better how media_stream_ is tied into Chromium.
864 ['enable_webrtc==0 and OS=="android"', { 849 ['enable_webrtc==0 and OS=="android"', {
865 'sources/': [ 850 'sources/': [
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1917 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1933 }, 1918 },
1934 ], 1919 ],
1935 }], 1920 }],
1936 ], 1921 ],
1937 }, 1922 },
1938 ], 1923 ],
1939 }], 1924 }],
1940 ], 1925 ],
1941 } 1926 }
OLDNEW
« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698