From 879f7881b46c0aaf12ea87b2a5aef656f5f2b5cb Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 11 Jul 2018 09:18:37 +0200 Subject: [PATCH] Add missing dependencies on //third_party/abseil-cpp/absl/memory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Abseil uses -isystem and -imsvc because of some warnings, these two flags are not used by "gn check", this introduced some regressions. CL https://chromium-review.googlesource.com/c/chromium/src/+/1124478 will try to switch back absl to -I. Bug: None Change-Id: I52e857ef1d11831393c35a1bee09479b83827bad Reviewed-on: https://webrtc-review.googlesource.com/88121 Reviewed-by: Kári Helgason Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#23923} --- examples/BUILD.gn | 1 + examples/androidnativeapi/BUILD.gn | 1 + sdk/BUILD.gn | 3 +++ sdk/android/BUILD.gn | 7 +++++++ 4 files changed, 12 insertions(+) diff --git a/examples/BUILD.gn b/examples/BUILD.gn index cbbe2a24e8..0753237e48 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -514,6 +514,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "../system_wrappers:field_trial_default", "../system_wrappers:metrics_default", "../system_wrappers:runtime_enabled_features_default", + "//third_party/abseil-cpp/absl/memory", ] if (current_cpu == "arm64") { diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn index d87fc3ffe9..7be09b7bc1 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -67,6 +67,7 @@ rtc_shared_library("examples_androidnativeapi_jni") { "//system_wrappers:field_trial_default", "//system_wrappers:metrics_default", "//system_wrappers:runtime_enabled_features_default", + "//third_party/abseil-cpp/absl/memory", ] } diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 37764b430e..c2263f676c 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -805,6 +805,7 @@ if (is_ios || is_mac) { "../pc:peerconnection", "../rtc_base:checks", "../rtc_base:rtc_base", + "//third_party/abseil-cpp/absl/memory", ] if (is_ios) { @@ -1186,6 +1187,7 @@ if (is_ios || is_mac) { "../api/video_codecs:video_codecs_api", "../common_video", "../rtc_base:rtc_base", + "//third_party/abseil-cpp/absl/memory", ] } @@ -1232,6 +1234,7 @@ if (is_ios || is_mac) { "../modules/video_coding:video_codec_interface", "../rtc_base:checks", "../rtc_base:rtc_base", + "//third_party/abseil-cpp/absl/memory", ] } diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 3ec3354be0..60fe50d1a3 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -92,6 +92,7 @@ rtc_source_set("base_jni") { "../../rtc_base:rtc_base", "../../rtc_base:rtc_base_approved", "../../system_wrappers:metrics_api", + "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] } @@ -127,6 +128,7 @@ rtc_source_set("native_api_audio_device_module") { "../../rtc_base:rtc_base_approved", "../../system_wrappers", "../../system_wrappers:metrics_api", + "//third_party/abseil-cpp/absl/memory", ] if (rtc_enable_android_aaudio) { deps += [ ":aaudio_audio_device_module" ] @@ -201,6 +203,7 @@ rtc_source_set("opensles_audio_device_module") { "../../modules/audio_device:audio_device_buffer", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", ] } @@ -640,6 +643,7 @@ rtc_static_library("peerconnection_jni") { "../../rtc_base:rtc_task_queue", "../../rtc_base:stringutils", "../../system_wrappers:field_trial_api", + "//third_party/abseil-cpp/absl/memory", ] } @@ -1264,6 +1268,7 @@ rtc_static_library("native_api_codecs") { "//api/video_codecs:video_codecs_api", "//rtc_base:checks", "//rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/memory", ] } @@ -1313,6 +1318,7 @@ rtc_static_library("native_api_video") { "//api:libjingle_peerconnection_api", "//api/video:video_frame", "//rtc_base:rtc_base_approved", + "//third_party/abseil-cpp/absl/memory", ] } @@ -1404,5 +1410,6 @@ rtc_source_set("native_unittests") { "//test:fileutils", "//test:test_support", "//testing/gtest", + "//third_party/abseil-cpp/absl/memory", ] }