mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-06 21:09:06 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
18 lines
685 B
Diff
18 lines
685 B
Diff
diff --git a/src/org/easymock/internal/MocksControl.java b/src/org/easymock/internal/MocksControl.java
|
|
index e709dc4..cd9d5a9 100644
|
|
--- a/src/org/easymock/internal/MocksControl.java
|
|
+++ b/src/org/easymock/internal/MocksControl.java
|
|
@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
|
|
return cached;
|
|
}
|
|
|
|
- // ///CLOVER:OFF
|
|
- if (AndroidSupport.isAndroid()) {
|
|
- return classProxyFactory = new AndroidClassProxyFactory();
|
|
- }
|
|
- // ///CLOVER:ON
|
|
-
|
|
try {
|
|
return classProxyFactory = new ClassProxyFactory();
|
|
} catch (final NoClassDefFoundError e) {
|