From 71208de565818707a5227fd7c76d24740b26fb0e Mon Sep 17 00:00:00 2001
From: Alex Tkachman <alex.tkachman@gmail.com>
Date: Tue, 14 Aug 2012 09:26:27 +0300
Subject: [PATCH] revert unsuccessful attempt to fix android build

---
 .../AbstractCodegenTestCaseOnAndroid.java        | 16 +---------------
 compiler/android-tests/android-tests.iml         |  1 -
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/AbstractCodegenTestCaseOnAndroid.java b/compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/AbstractCodegenTestCaseOnAndroid.java
index e01365a3e18..9d6fb547270 100644
--- a/compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/AbstractCodegenTestCaseOnAndroid.java
+++ b/compiler/android-tests/android-module/src/org/jetbrains/jet/compiler/android/AbstractCodegenTestCaseOnAndroid.java
@@ -18,8 +18,6 @@ package org.jetbrains.jet.compiler.android;
 
 import junit.framework.TestCase;
 
-import java.lang.String;
-import java.lang.Throwable;
 import java.lang.reflect.Method;
 
 /**
@@ -33,19 +31,7 @@ public class AbstractCodegenTestCaseOnAndroid extends TestCase {
             Class clazz;
             clazz = Class.forName(filePath.replaceAll("\\\\|-|\\.|/", "_") + ".namespace");
             Method method;
-            try {
-                method = clazz.getMethod("box");
-            }
-            catch (NoSuchMethodException e) {
-                try {
-                    method = clazz.getMethod("main", String[].class);
-                }
-                catch(Throwable t) {
-                    throw new RuntimeException("File: " + filePath, t);
-                }
-                method.invoke(null);
-                return;
-            }
+            method = clazz.getMethod("box");
             assertEquals("OK", method.invoke(null));
         }
         catch (Throwable e) {
diff --git a/compiler/android-tests/android-tests.iml b/compiler/android-tests/android-tests.iml
index 77d875b8a9a..82dfa01213e 100644
--- a/compiler/android-tests/android-tests.iml
+++ b/compiler/android-tests/android-tests.iml
@@ -5,7 +5,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/android-module/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />