From 6b09c451dc7a7bdc3b2183171bfc96209f889889 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 5 Jul 2021 16:47:49 +0200 Subject: [PATCH] Silence OpenGLES deprecation warning. The deprecation warning started to trigger after the iOS deployment target has been updated from 10 to 12 by https://webrtc-review.googlesource.com/c/src/+/224543. This macro was not defined in tests because the relevant bots were excluded from CQ when that happened. Bug: webrtc:12928, webrtc:12937 Change-Id: I6e1891c5080b172cbd74649e0a115b25d6c87d56 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/225020 Reviewed-by: Victor Boivie Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#34417} --- sdk/BUILD.gn | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 79b483df14..d63f416790 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -462,6 +462,9 @@ if (is_ios || is_mac) { "OpenGL.framework", ] } + + # TODO(bugs.webrtc.org/12937): Remove OpenGL deprecation warning + # workaround. defines = [ "GLES_SILENCE_DEPRECATION" ] deps = [ @@ -500,6 +503,9 @@ if (is_ios || is_mac) { "objc/components/renderer/opengl/RTCEAGLVideoView.h", "objc/components/renderer/opengl/RTCEAGLVideoView.m", ] + + # TODO(bugs.webrtc.org/12937): Remove OpenGL deprecation warning + # workaround. defines = [ "GLES_SILENCE_DEPRECATION" ] } if (is_mac) { @@ -1039,6 +1045,10 @@ if (is_ios || is_mac) { "objc/unittests/nalu_rewriter_xctest.mm", ] + # TODO(bugs.webrtc.org/12937): Remove OpenGL deprecation warning + # workaround. + defines = [ "GLES_SILENCE_DEPRECATION" ] + # TODO(peterhanspers): Reenable these tests on simulator. # See bugs.webrtc.org/7812 if (target_environment != "simulator") {