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

Side by Side Diff: build/all.gyp

Issue 620373003: Revert of Making WebRTC Java api avaliable in Chromium. (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 | « no previous file | third_party/libjingle/BUILD.gn » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 # WebRTC Chromium tests to run on Android. 829 # WebRTC Chromium tests to run on Android.
830 'target_name': 'android_builder_chromium_webrtc', 830 'target_name': 'android_builder_chromium_webrtc',
831 'type': 'none', 831 'type': 'none',
832 'dependencies': [ 832 'dependencies': [
833 '../content/content_shell_and_tests.gyp:content_browsertests', 833 '../content/content_shell_and_tests.gyp:content_browsertests',
834 '../tools/android/android_tools.gyp:android_tools', 834 '../tools/android/android_tools.gyp:android_tools',
835 '../tools/android/android_tools.gyp:memconsumer', 835 '../tools/android/android_tools.gyp:memconsumer',
836 # Unit test bundles packaged as an apk. 836 # Unit test bundles packaged as an apk.
837 '../content/content_shell_and_tests.gyp:content_browsertests_apk', 837 '../content/content_shell_and_tests.gyp:content_browsertests_apk',
838 ], 838 ],
839 'conditions': [
840 ['"<(libpeer_target_type)"=="static_library"', {
841 'dependencies': [
842 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection _javalib',
843 ],
844 }],
845 ],
846 }, # target_name: android_builder_chromium_webrtc 839 }, # target_name: android_builder_chromium_webrtc
847 ], # targets 840 ], # targets
848 }], # OS="android" 841 }], # OS="android"
849 ['OS=="mac"', { 842 ['OS=="mac"', {
850 'targets': [ 843 'targets': [
851 { 844 {
852 # Target to build everything plus the dmg. We don't put the dmg 845 # Target to build everything plus the dmg. We don't put the dmg
853 # in the All target because developers really don't need it. 846 # in the All target because developers really don't need it.
854 'target_name': 'all_and_dmg', 847 'target_name': 'all_and_dmg',
855 'type': 'none', 848 'type': 'none',
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 'dependencies': [ 1323 'dependencies': [
1331 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1324 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1332 '../ui/views/views.gyp:views', 1325 '../ui/views/views.gyp:views',
1333 '../ui/views/views.gyp:views_unittests', 1326 '../ui/views/views.gyp:views_unittests',
1334 ], 1327 ],
1335 }, # target_name: macviews_builder 1328 }, # target_name: macviews_builder
1336 ], # targets 1329 ], # targets
1337 }], # os=='mac' and toolkit_views==1 1330 }], # os=='mac' and toolkit_views==1
1338 ], # conditions 1331 ], # conditions
1339 } 1332 }
OLDNEW
« no previous file with comments | « no previous file | third_party/libjingle/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698