[easymock] 13/37: Rebase no-android.patch.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository easymock.

commit 8872a0f867f5e6b695a1206177cde96bbb302041
Author: Markus Koschany <apo at debian.org>
Date:   Fri Oct 7 12:38:59 2016 +0200

    Rebase no-android.patch.
---
 debian/patches/no-android.patch | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/no-android.patch b/debian/patches/no-android.patch
new file mode 100644
index 0000000..46aba28
--- /dev/null
+++ b/debian/patches/no-android.patch
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 7 Oct 2016 12:38:19 +0200
+Subject: no android
+
+---
+ core/src/main/java/org/easymock/internal/MocksControl.java | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java
+index 6ae65d1..0dc795d 100644
+--- a/core/src/main/java/org/easymock/internal/MocksControl.java
++++ b/core/src/main/java/org/easymock/internal/MocksControl.java
+@@ -142,9 +142,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
+         }
+ 
+         // ///CLOVER:OFF
+-        if (AndroidSupport.isAndroid()) {
+-            return classProxyFactory = new AndroidClassProxyFactory();
+-        }
+         // ///CLOVER:ON
+ 
+         return classProxyFactory = new ClassProxyFactory();
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d1d13c1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-android.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git