1 files changed, 26 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index ac41b9c..3c2fb11 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,12 +50,30 @@ license {
     ],
 }
 
+// NOTE: New users of this library should prefer the 
+// commons-math3 library over the commons-math library.
+
 java_library {
     name: "apache-commons-math",
     host_supported: true,
     java_version: "1.7",
 
-    srcs: ["src/main/java/**/*.java"],
+    srcs: ["src/main/java/org/apache/commons/math/**/*.java"],
+    sdk_version: "current",
+    errorprone: {
+        javacflags: [
+            "-Xep:MissingOverride:OFF",
+            "-Xep:IdentityBinaryExpression:OFF",
+            "-Xep:BoxedPrimitiveEquality:OFF",
+        ],
+    },
+}
+
+java_library {
+    name: "apache-commons-math3",
+    host_supported: true,
+    java_version: "1.7",
+    srcs: ["src/main/java/org/apache/commons/math3/**/*.java"],
     sdk_version: "current",
     errorprone: {
         javacflags: [
@@ -64,6 +82,13 @@ java_library {
             "-Xep:BoxedPrimitiveEquality:OFF",
         ],
     },
+    target: {
+        android: {
+            // Exclude the geometry module from Android variant due to missing dependency
+            // on java.awt.geom.AffineTransform.
+            exclude_srcs: ["src/main/java/org/apache/commons/math3/geometry/**/*.java"]
+        }
+    }
 }
 
 java_library_host {