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

Side by Side Diff: webrtc/build/apk_tests.gyp

Issue 1184763009: Merge video_engine_core into webrtc target. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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/base/base.gyp ('k') | webrtc/video/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) 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 # This file exists in two versions. A no-op version under 9 # This file exists in two versions. A no-op version under
10 # webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk 10 # webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 ], 146 ],
147 }, 147 },
148 { 148 {
149 'target_name': 'video_engine_core_unittests_apk', 149 'target_name': 'video_engine_core_unittests_apk',
150 'type': 'none', 150 'type': 'none',
151 'variables': { 151 'variables': {
152 'test_suite_name': 'video_engine_core_unittests', 152 'test_suite_name': 'video_engine_core_unittests',
153 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_ core_unittests<(SHARED_LIB_SUFFIX)', 153 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_ core_unittests<(SHARED_LIB_SUFFIX)',
154 }, 154 },
155 'dependencies': [ 155 'dependencies': [
156 '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core_unittest s', 156 '<(webrtc_root)/video_engine/video_engine_core_unittests.gyp:video_engin e_core_unittests',
157 ], 157 ],
158 'includes': [ 158 'includes': [
159 '../../build/apk_test.gypi', 159 '../../build/apk_test.gypi',
160 ], 160 ],
161 }, 161 },
162 { 162 {
163 'target_name': 'video_engine_tests_apk', 163 'target_name': 'video_engine_tests_apk',
164 'type': 'none', 164 'type': 'none',
165 'variables': { 165 'variables': {
166 'test_suite_name': 'video_engine_tests', 166 'test_suite_name': 'video_engine_tests',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 'never_lint': 1, 252 'never_lint': 1,
253 }, 253 },
254 'includes': [ 254 'includes': [
255 '../../build/java.gypi', 255 '../../build/java.gypi',
256 ], 256 ],
257 }, 257 },
258 ], 258 ],
259 } 259 }
260 260
261 261
OLDNEW
« no previous file with comments | « webrtc/base/base.gyp ('k') | webrtc/video/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698