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

Side by Side Diff: all.gyp

Issue 2080563002: Workaround java.gypi inclusion error in Chromium builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Changes to all.gyp Created 4 years, 6 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 | webrtc/api/api.gyp » ('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 WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2013 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 { 9 {
10 'variables': { 10 'variables': {
(...skipping 18 matching lines...) Expand all
29 'webrtc/p2p/p2p.gyp:*', 29 'webrtc/p2p/p2p.gyp:*',
30 'webrtc/pc/pc.gyp:*', 30 'webrtc/pc/pc.gyp:*',
31 'webrtc/system_wrappers/system_wrappers.gyp:*', 31 'webrtc/system_wrappers/system_wrappers.gyp:*',
32 'webrtc/tools/tools.gyp:*', 32 'webrtc/tools/tools.gyp:*',
33 'webrtc/voice_engine/voice_engine.gyp:*', 33 'webrtc/voice_engine/voice_engine.gyp:*',
34 'webrtc/webrtc.gyp:*', 34 'webrtc/webrtc.gyp:*',
35 '<(webrtc_vp8_dir)/vp8.gyp:*', 35 '<(webrtc_vp8_dir)/vp8.gyp:*',
36 '<(webrtc_vp9_dir)/vp9.gyp:*', 36 '<(webrtc_vp9_dir)/vp9.gyp:*',
37 ], 37 ],
38 'conditions': [ 38 'conditions': [
39 ['OS=="android" and build_with_chromium==0', {
40 'dependencies': [
41 'webrtc/api/api_java.gyp:*',
42 ],
43 }],
39 ['include_tests==1', { 44 ['include_tests==1', {
40 'includes': [ 45 'includes': [
41 'webrtc/webrtc_tests.gypi', 46 'webrtc/webrtc_tests.gypi',
42 ], 47 ],
43 'dependencies': [ 48 'dependencies': [
44 'webrtc/api/api_tests.gyp:*', 49 'webrtc/api/api_tests.gyp:*',
45 'webrtc/common_video/common_video_unittests.gyp:*', 50 'webrtc/common_video/common_video_unittests.gyp:*',
46 'webrtc/system_wrappers/system_wrappers_tests.gyp:*', 51 'webrtc/system_wrappers/system_wrappers_tests.gyp:*',
47 'webrtc/test/metrics.gyp:*', 52 'webrtc/test/metrics.gyp:*',
48 'webrtc/test/test.gyp:*', 53 'webrtc/test/test.gyp:*',
(...skipping 18 matching lines...) Expand all
67 'dependencies': [ 72 'dependencies': [
68 'talk/app/webrtc/legacy_objc_api_tests.gyp:*', 73 'talk/app/webrtc/legacy_objc_api_tests.gyp:*',
69 ], 74 ],
70 }], 75 }],
71 ], 76 ],
72 }], 77 }],
73 ], 78 ],
74 }, 79 },
75 ], 80 ],
76 } 81 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/api.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698