From 2bfa071d0900ac6e08d470035e162664dbd6425b Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Mon, 7 Aug 2023 11:54:35 +0200
Subject: [PATCH] Add GN flag for an easier JNI generator upgrade.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: b/293234089
Change-Id: I06dca333a806992cbff1b175f1b0875728a9f1fb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315120
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40518}
---
 BUILD.gn   | 4 ++++
 webrtc.gni | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index 67c5603364..661e36f16a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -138,6 +138,10 @@ config("common_inherited_config") {
   cflags = []
   ldflags = []
 
+  if (rtc_jni_generator_legacy_symbols) {
+    defines += [ "RTC_JNI_GENERATOR_LEGACY_SYMBOLS" ]
+  }
+
   if (rtc_objc_prefix != "") {
     defines += [ "RTC_OBJC_TYPE_PREFIX=${rtc_objc_prefix}" ]
   }
diff --git a/webrtc.gni b/webrtc.gni
index c6509c837b..097ad4a377 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -49,6 +49,10 @@ declare_args() {
 }
 
 declare_args() {
+  # If set to true, C++ code will refer to the new JNI Generator symbols.
+  # If set to false the old ones will be used (to provide a nice update path).
+  rtc_jni_generator_legacy_symbols = false
+
   # Setting this to true, will make RTC_DLOG() expand to log statements instead
   # of being removed by the preprocessor.
   # This is useful for example to be able to get RTC_DLOGs on a release build.