From 48697151680a017155ebcfcda2645e874ed8657f Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Wed, 2 Nov 2016 16:50:44 -0700
Subject: [PATCH] [config] Remove unnecessary --java option

Reviewed By: jeremydubreil

Differential Revision: D4110726

fbshipit-source-id: 9146d39
---
 infer/lib/python/inferlib/analyze.py | 1 -
 infer/src/base/Config.ml             | 9 +++------
 infer/src/base/Config.mli            | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/infer/lib/python/inferlib/analyze.py b/infer/lib/python/inferlib/analyze.py
index 5ad32fee7..3688a4a96 100644
--- a/infer/lib/python/inferlib/analyze.py
+++ b/infer/lib/python/inferlib/analyze.py
@@ -213,7 +213,6 @@ class AnalyzerWrapper(object):
         exit_status = os.EX_OK
 
         if self.javac is not None and self.args.buck:
-            infer_options += ['-java']
             if self.javac.args.classpath is not None:
                 for path in self.javac.args.classpath.split(os.pathsep):
                     if os.path.isfile(path):
diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml
index a11232f0d..31bf70379 100644
--- a/infer/src/base/Config.ml
+++ b/infer/src/base/Config.ml
@@ -717,12 +717,6 @@ and copy_propagation =
   CLOpt.mk_bool ~deprecated:["copy-propagation"] ~long:"copy-propagation"
     "Perform copy-propagation on the IR"
 
-(** Set language to Java *)
-and curr_language =
-  let var = ref Clang in
-  CLOpt.mk_set var Java ~deprecated:["java"] ~long:"java" "";
-  var
-
 and cxx_experimental =
   CLOpt.mk_bool ~deprecated:["cxx-experimental"] ~long:"cxx"
     ~exes:CLOpt.[Clang]
@@ -1627,6 +1621,9 @@ let set_reference_and_call_function reference value f x =
       restore ();
       raise exn
 
+(** Current language *)
+let curr_language = ref Clang
+
 (** Flag for footprint discovery mode *)
 let footprint = ref true
 
diff --git a/infer/src/base/Config.mli b/infer/src/base/Config.mli
index 908ee76f4..26640e405 100644
--- a/infer/src/base/Config.mli
+++ b/infer/src/base/Config.mli
@@ -278,6 +278,8 @@ val xml_specs : bool
     Restore the initial value also in case of exception. *)
 val set_reference_and_call_function : 'a ref -> 'a -> ('b -> 'c) -> 'b -> 'c
 
+val curr_language : language ref
+
 val footprint : bool ref
 
 (** Call f x with footprint set to true.
@@ -305,7 +307,6 @@ val run_with_abs_val_equal_zero : ('a -> 'b) -> 'a -> 'b
 
 val allow_leak : bool ref
 val arc_mode : bool ref
-val curr_language : language ref
 
 
 (** Command Line Interface Documentation *)