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

Side by Side Diff: webrtc/sdk/android/BUILD.gn

Issue 3003393002: Roll chromium_revision d323a482ee..7114a66134 (494468:497367) manually (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 | « webrtc/rtc_base/BUILD.gn ('k') | webrtc/test/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) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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("../../webrtc.gni") 9 import("../../webrtc.gni")
10 import("//build/config/android/config.gni") 10 import("//build/config/android/config.gni")
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 "src/java/org/webrtc/VideoCodecType.java", 444 "src/java/org/webrtc/VideoCodecType.java",
445 "src/java/org/webrtc/VideoDecoderWrapperCallback.java", 445 "src/java/org/webrtc/VideoDecoderWrapperCallback.java",
446 "src/java/org/webrtc/WrappedNativeI420Buffer.java", 446 "src/java/org/webrtc/WrappedNativeI420Buffer.java",
447 "src/java/org/webrtc/YuvConverter.java", 447 "src/java/org/webrtc/YuvConverter.java",
448 ] 448 ]
449 449
450 deps = [ 450 deps = [
451 "../../modules/audio_device:audio_device_java", 451 "../../modules/audio_device:audio_device_java",
452 "../../rtc_base:base_java", 452 "../../rtc_base:base_java",
453 ] 453 ]
454
455 # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
456 no_build_hooks = true
454 } 457 }
455 458
456 android_library("libjingle_peerconnection_metrics_default_java") { 459 android_library("libjingle_peerconnection_metrics_default_java") {
457 java_files = [ "api/org/webrtc/Metrics.java" ] 460 java_files = [ "api/org/webrtc/Metrics.java" ]
458 461
459 deps = [ 462 deps = [
460 "../../rtc_base:base_java", 463 "../../rtc_base:base_java",
461 ] 464 ]
465
466 # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
467 no_build_hooks = true
462 } 468 }
463 469
464 if (rtc_include_tests) { 470 if (rtc_include_tests) {
465 instrumentation_test_apk("libjingle_peerconnection_android_unittest") { 471 instrumentation_test_apk("libjingle_peerconnection_android_unittest") {
466 apk_name = "libjingle_peerconnection_android_unittest" 472 apk_name = "libjingle_peerconnection_android_unittest"
467 android_manifest = "instrumentationtests/AndroidManifest.xml" 473 android_manifest = "instrumentationtests/AndroidManifest.xml"
468 474
469 java_files = [ 475 java_files = [
470 "instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.ja va", 476 "instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.ja va",
471 "instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java" , 477 "instrumentationtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java" ,
(...skipping 23 matching lines...) Expand all
495 "../../sdk/android:libjingle_peerconnection_java", 501 "../../sdk/android:libjingle_peerconnection_java",
496 "../../sdk/android:libjingle_peerconnection_metrics_default_java", 502 "../../sdk/android:libjingle_peerconnection_metrics_default_java",
497 "//base:base_java", 503 "//base:base_java",
498 "//base:base_java_test_support", 504 "//base:base_java_test_support",
499 "//third_party/android_support_test_runner:rules_java", 505 "//third_party/android_support_test_runner:rules_java",
500 "//third_party/android_support_test_runner:runner_java", 506 "//third_party/android_support_test_runner:runner_java",
501 "//third_party/junit", 507 "//third_party/junit",
502 ] 508 ]
503 509
504 shared_libraries = [ "../../sdk/android:libjingle_peerconnection_so" ] 510 shared_libraries = [ "../../sdk/android:libjingle_peerconnection_so" ]
511
512 # TODO(sakal): Fix build hooks crbug.com/webrtc/8148
513 no_build_hooks = true
505 } 514 }
506 } 515 }
OLDNEW
« no previous file with comments | « webrtc/rtc_base/BUILD.gn ('k') | webrtc/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698