Commit 8e7f09f2 authored by Michael Froman's avatar Michael Froman
Browse files

Bug 1813846 - relax some of the BUILD.gn restrictions for easier fast-forward work. r=ng DONTBUILD 

Note: these changes do not change the generated moz.build output.

Differential Revision: https://phabricator.services.mozilla.com/D168316
parent 9dc05af7

third_party/libwebrtc/api/BUILD.gn

+3 −1
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") { 
    "//third_party/abseil-cpp/absl/types:optional",

  ]

}

}



rtc_source_set("frame_generator_api") {

  visibility = [ "*" ]
@@ -566,6 +567,7 @@ rtc_source_set("frame_generator_api") { 
  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]

}



if (!build_with_mozilla) {

rtc_library("test_dependency_factory") {

  visibility = [ "*" ]

  testonly = true
@@ -632,7 +634,6 @@ if (rtc_include_tests) { 
  }

}



if (!build_with_mozilla) {

rtc_library("create_frame_generator") {

  visibility = [ "*" ]

  testonly = true
@@ -649,6 +650,7 @@ rtc_library("create_frame_generator") { 
  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]

}



if (!build_with_mozilla) {

rtc_library("create_peer_connection_quality_test_frame_generator") {

  visibility = [ "*" ]

  testonly = true

third_party/libwebrtc/rtc_base/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -805,7 +805,6 @@ config("rtc_json_suppressions") { 
  }

}



if (!build_with_mozilla) {

rtc_library("rtc_json") {

  public_configs = [ ":rtc_json_suppressions" ]

  poisonous = [ "rtc_json" ]
@@ -815,7 +814,9 @@ rtc_library("rtc_json") { 
    "strings/json.h",

  ]

  deps = [ ":stringutils" ]

if (!build_with_mozilla) {

  all_dependent_configs = [ "//third_party/jsoncpp:jsoncpp_config" ]

}

  if (rtc_build_json) {

    deps += [ "//third_party/jsoncpp" ]

  } else {
@@ -827,7 +828,6 @@ rtc_library("rtc_json") { 
  }

  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]

}

}



rtc_library("net_helpers") {

  sources = [

third_party/libwebrtc/test/BUILD.gn

+19 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ if (is_android) { 
  import("//build/config/android/rules.gni")

}



if (!build_with_mozilla) {

if (!build_with_chromium) {

  group("test") {

    testonly = true
@@ -158,6 +157,7 @@ rtc_library("audio_test_common") { 
  absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]

}



if (!build_with_mozilla) {

if (!build_with_chromium) {

  if (is_mac || is_ios) {

    rtc_library("video_test_mac") {
@@ -239,7 +239,6 @@ rtc_library("rtp_test_utils") { 
  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]

}



if (!build_with_mozilla) {

rtc_library("field_trial") {

  testonly = true

  visibility = [ "*" ]
@@ -404,6 +403,16 @@ rtc_source_set("test_support") { 
    "//testing/gmock",

    "//testing/gtest",

  ]

  if (build_with_mozilla) {

    all_dependent_configs -= [

      "//third_party/googletest:gmock_config",

      "//third_party/googletest:gtest_config",

    ]

    deps -= [

      "//testing/gmock",

      "//testing/gtest"

    ]

  }

}



rtc_library("fixed_fps_video_frame_writer_adapter") {
@@ -465,7 +474,9 @@ rtc_library("video_test_support") { 
  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]



  if (!is_ios) {

    if (!build_with_mozilla) {

    deps += [ "//third_party:jpeg" ]

    }

    sources += [ "testsupport/jpeg_frame_writer.cc" ]

  } else {

    sources += [ "testsupport/jpeg_frame_writer_ios.cc" ]
@@ -1015,6 +1026,10 @@ rtc_library("test_common") { 
  if (!is_android && !build_with_chromium) {

    deps += [ "../modules/video_capture:video_capture_internal_impl" ]

  }

  # This, or some form of it should be upstreamed.

  if (!rtc_include_tests) {

    deps -= [ "../rtc_base:task_queue_for_test" ]

  }

}



rtc_library("mock_transport") {
@@ -1178,6 +1193,7 @@ rtc_library("copy_to_file_audio_capturer_unittest") { 
  ]

}



if (!build_with_mozilla) {

if (!build_with_chromium && is_android) {

  rtc_android_library("native_test_java") {

    testonly = true
@@ -1191,6 +1207,7 @@ if (!build_with_chromium && is_android) { 
    ]

  }

}

}



rtc_library("call_config_utils") {

  # TODO(bugs.webrtc.org/10814): Remove rtc_json_suppressions as soon as it
@@ -1222,4 +1239,3 @@ rtc_library("fake_encoded_frame") { 
  ]

  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]

}
 
}