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

Side by Side Diff: webrtc/api/api_tests.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 | « webrtc/api/api_java.gyp ('k') | webrtc/build/android_tests.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) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 ], # conditions 122 ], # conditions
123 }, # target peerconnection_unittests 123 }, # target peerconnection_unittests
124 ], # targets 124 ], # targets
125 'conditions': [ 125 'conditions': [
126 ['OS=="android"', { 126 ['OS=="android"', {
127 'targets': [ 127 'targets': [
128 { 128 {
129 'target_name': 'libjingle_peerconnection_android_unittest', 129 'target_name': 'libjingle_peerconnection_android_unittest',
130 'type': 'none', 130 'type': 'none',
131 'dependencies': [ 131 'dependencies': [
132 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_java', 132 '<(webrtc_root)/api/api_java.gyp:libjingle_peerconnection_java',
133 ], 133 ],
134 'variables': { 134 'variables': {
135 'apk_name': 'libjingle_peerconnection_android_unittest', 135 'apk_name': 'libjingle_peerconnection_android_unittest',
136 'java_in_dir': 'androidtests', 136 'java_in_dir': 'androidtests',
137 'resource_dir': 'androidtests/res', 137 'resource_dir': 'androidtests/res',
138 'native_lib_target': 'libjingle_peerconnection_so', 138 'native_lib_target': 'libjingle_peerconnection_so',
139 'is_test_apk': 1, 139 'is_test_apk': 1,
140 'test_type': 'instrumentation', 140 'test_type': 'instrumentation',
141 'tested_apk_path': '', 141 'tested_apk_path': '',
142 'never_lint': 1, 142 'never_lint': 1,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 '../build/isolate.gypi', 192 '../build/isolate.gypi',
193 ], 193 ],
194 'sources': [ 194 'sources': [
195 'peerconnection_unittests.isolate', 195 'peerconnection_unittests.isolate',
196 ], 196 ],
197 }, 197 },
198 ], # targets 198 ], # targets
199 }], # test_isolation_mode != "noop" 199 }], # test_isolation_mode != "noop"
200 ], # conditions 200 ], # conditions
201 } 201 }
OLDNEW
« no previous file with comments | « webrtc/api/api_java.gyp ('k') | webrtc/build/android_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698