From e7fac68c97616c39869689d837abcfe63ae012a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= <sakal@webrtc.org>
Date: Tue, 20 Mar 2018 16:32:49 +0100
Subject: Introduce Nullable annotation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just adds the annotation to base_java for now to check that this does
not break any downstream targets.

Bug: webrtc:8881
Change-Id: I9425020e36be5e52447cec592a4474a9eb09b5bd
Reviewed-on: https://webrtc-review.googlesource.com/51960
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22526}
---
 webrtc.gni | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'webrtc.gni')

diff --git a/webrtc.gni b/webrtc.gni
index f2a196ed61..f91aa01579 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -496,8 +496,15 @@ if (is_android) {
                                "visibility",
                              ])
 
+      javac_args = []
+
       # Treat warnings as errors.
-      javac_args = [ "-Werror" ]
+      javac_args += [ "-Werror" ]
+
+      # Add any arguments defined by the invoker.
+      if (defined(invoker.javac_args)) {
+        javac_args += invoker.javac_args
+      }
 
       no_build_hooks = true
     }
-- 
cgit v1.2.3