Move test location lookup to jack project

- Introduce undocumented test property "android.home"
for tests that really require an Android source tree
Otherwise use the mandatory jack.home property

- Get rid of ANDROID_BUILD_TOP

Change-Id: Ifabc83fcb8a872eafe35e9e79c28ab9ee3348c6b

2 files changed, 4 insertions, 3 deletions

diff --git a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java
index 155e56b..1867467 100644
--- a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java
+++ b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java
@@ -26,6 +26,7 @@ import com.android.jack.errorhandling.annotationprocessor.SourceAnnotationProces
 import com.android.jack.errorhandling.annotationprocessor.SourceAnnotationTest;
 import com.android.jack.errorhandling.annotationprocessor.SourceErrorAnnotationTest;
 import com.android.jack.frontend.FrontendCompilationException;
+import com.android.jack.test.TestsProperties;
 import com.android.jack.test.helper.ErrorTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.JackApiToolchain;
@@ -224,7 +225,7 @@ public class AnnotationProcessorErrorTest {
     }
 
     for (Class<?> annotationClass : annotationClasses) {
-    Files.copy(new File(AbstractTestTools.getJackRootDir(),
+    Files.copy(new File(TestsProperties.getJackRootDir(),
         "jack/tests/com/android/jack/errorhandling/annotationprocessor/"
         + annotationClass.getSimpleName() + ".java"), new File(
         targetAnnotationFileFolder, annotationClass.getSimpleName() + ".java"));
diff --git a/jack-tests/tests/com/android/jack/opcodes/OpcodesTests.java b/jack-tests/tests/com/android/jack/opcodes/OpcodesTests.java
index 595e47f..3e66003 100644
--- a/jack-tests/tests/com/android/jack/opcodes/OpcodesTests.java
+++ b/jack-tests/tests/com/android/jack/opcodes/OpcodesTests.java
@@ -16,6 +16,7 @@
 
 package com.android.jack.opcodes;
 
+import com.android.jack.test.TestsProperties;
 import com.android.jack.test.category.RuntimeRegressionTest;
 import com.android.jack.test.helper.RuntimeTestHelper;
 import com.android.jack.test.runtime.RuntimeTest;
@@ -38,10 +39,9 @@ public class OpcodesTests extends RuntimeTest {
       super(directory, jUnit);
       setSrcDirName("jm");
       setRefDirName( ".");
-      addReferenceExtraSources(new File(AbstractTestTools.getJackRootDir(),
+      addReferenceExtraSources(new File(TestsProperties.getJackRootDir(),
           "jack-tests/src/com/android/jack/DxTestCase.java"));
     }
-
   }
 
   @Nonnull