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.