Respect user input if abi_generation_mode is explicitly provided in j…

…ava_library (facebook#2467)
styurin · Jun 25, 2020 · 1c31c5b · 1c31c5b
1 parent 75c67e4
commit 1c31c5b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/com/facebook/buck/jvm/java/DefaultJavaLibraryRules.java b/src/com/facebook/buck/jvm/java/DefaultJavaLibraryRules.java
@@ -302,10 +302,15 @@ AbiGenerationMode getAbiGenerationMode() {
     if (args != null) {
       result = args.getAbiGenerationMode().orElse(null);
     }
-    if (result == null) {
-      result = Objects.requireNonNull(getConfiguredCompilerFactory()).getAbiGenerationMode();
+
+    // Respect user input if provided
+    if (result != null) {
+      return result;
     }
 
+    // Infer ABI generation mode based on properties of build target
+    result = Objects.requireNonNull(getConfiguredCompilerFactory()).getAbiGenerationMode();
+
     if (result == AbiGenerationMode.CLASS) {
       return result;
     }