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

Side by Side Diff: webrtc/webrtc.gni

Issue 3008083004: Revert of Add //build/android/pylib/results/ to Android isolate packaging (Closed)
Patch Set: Created 3 years, 3 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 | no next file » | 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) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 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 import("//build/config/arm.gni") 9 import("//build/config/arm.gni")
10 import("//build/config/features.gni") 10 import("//build/config/features.gni")
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 configs = rtc_add_configs 258 configs = rtc_add_configs
259 suppressed_configs = [] 259 suppressed_configs = []
260 } 260 }
261 261
262 template("rtc_test") { 262 template("rtc_test") {
263 test(target_name) { 263 test(target_name) {
264 forward_variables_from(invoker, 264 forward_variables_from(invoker,
265 "*", 265 "*",
266 [ 266 [
267 "configs", 267 "configs",
268 "data",
269 "public_configs", 268 "public_configs",
270 "suppressed_configs", 269 "suppressed_configs",
271 ]) 270 ])
272 configs += invoker.configs 271 configs += invoker.configs
273 configs -= rtc_remove_configs 272 configs -= rtc_remove_configs
274 configs -= invoker.suppressed_configs 273 configs -= invoker.suppressed_configs
275 public_configs = [ rtc_common_inherited_config ] 274 public_configs = [ rtc_common_inherited_config ]
276 if (defined(invoker.public_configs)) { 275 if (defined(invoker.public_configs)) {
277 public_configs += invoker.public_configs 276 public_configs += invoker.public_configs
278 } 277 }
279 if (!build_with_chromium && is_android) { 278 if (!build_with_chromium && is_android) {
280 android_manifest = webrtc_root + "test/android/AndroidManifest.xml" 279 android_manifest = webrtc_root + "test/android/AndroidManifest.xml"
281 deps += [ webrtc_root + "test:native_test_java" ] 280 deps += [ webrtc_root + "test:native_test_java" ]
282
283 # Needed for build/android/pylib/results/presentation/test_results_present ation.py
284 data = [
285 "//build/android/pylib/results/",
286 ]
287 if (defined(invoker.data)) {
ehmaldonado_webrtc 2017/09/05 17:22:33 D'oh, this should be outside the if (!build_with_c
kjellander_webrtc 2017/09/06 08:43:21 Yeah, that's probably it. I'll make that change in
288 data += invoker.data
289 }
290 } 281 }
291 } 282 }
292 } 283 }
293 284
294 template("rtc_source_set") { 285 template("rtc_source_set") {
295 source_set(target_name) { 286 source_set(target_name) {
296 forward_variables_from(invoker, 287 forward_variables_from(invoker,
297 "*", 288 "*",
298 [ 289 [
299 "configs", 290 "configs",
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 configs += invoker.configs 382 configs += invoker.configs
392 configs -= rtc_remove_configs 383 configs -= rtc_remove_configs
393 configs -= invoker.suppressed_configs 384 configs -= invoker.suppressed_configs
394 public_configs = [ rtc_common_inherited_config ] 385 public_configs = [ rtc_common_inherited_config ]
395 if (defined(invoker.public_configs)) { 386 if (defined(invoker.public_configs)) {
396 public_configs += invoker.public_configs 387 public_configs += invoker.public_configs
397 } 388 }
398 } 389 }
399 } 390 }
400 } 391 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698