1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index c33a27365b..d8f7cbb724 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -231,6 +231,13 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
             help = "Specifies Android SDK/platform that is used to build Android applications.")
     public Label sdk;
 
+    @Option(name = "legacy_android_native_support",
+        defaultValue = "true",
+        category = "semantics",
+        help = "Switches back to old native support for android_binaries. Disable to link together "
+            + "native deps of android_binaries into a single .so by default.")
+    public boolean legacyNativeSupport;
+
     // TODO(bazel-team): Maybe merge this with --android_cpu above.
     @Option(name = "fat_apk_cpu",
             converter = Converters.CommaSeparatedOptionListConverter.class,
@@ -388,6 +395,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
 
   private final Label sdk;
   private final StrictDepsMode strictDeps;
+  private final boolean legacyNativeSupport;
   private final String cpu;
   private final boolean incrementalNativeLibs;
   private final boolean usesAndroidCrosstool;
@@ -406,6 +414,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.sdk = androidSdk;
     this.incrementalNativeLibs = options.incrementalNativeLibs;
     this.strictDeps = options.strictDeps;
+    this.legacyNativeSupport = options.legacyNativeSupport;
     this.cpu = options.cpu;
     this.usesAndroidCrosstool = (options.androidCrosstoolTop != null);
     this.configurationDistinguisher = options.configurationDistinguisher;
@@ -434,6 +443,10 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return sdk;
   }
 
+  public boolean getLegacyNativeSupport() {
+    return legacyNativeSupport;
+  }
+
   public StrictDepsMode getStrictDeps() {
     return strictDeps;
   }