Remove dx's copy of JUnit. (part II)
This is a second attempt to cherry-pick
4cd7b39876bcec03bb1d0c2afa61cbdb7d119eba
because a couple things didn't come through last time.
Change-Id: I12e5340f0504c1d875d3e4bbe23d8d5506f72fe6
diff --git a/dx/junit-tests/Android.mk b/dx/junit-tests/Android.mk
index 3f2c611..e1f3c41 100644
--- a/dx/junit-tests/Android.mk
+++ b/dx/junit-tests/Android.mk
@@ -5,5 +5,6 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAVA_LIBRARIES := dx junit
LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := tests
LOCAL_MODULE:= dx-tests
include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/dx/junit-tests/com/android/dx/util/BitIntSetTest.java b/dx/junit-tests/com/android/dx/util/BitIntSetTest.java
index 6d1b9e8..d46d14f 100644
--- a/dx/junit-tests/com/android/dx/util/BitIntSetTest.java
+++ b/dx/junit-tests/com/android/dx/util/BitIntSetTest.java
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-package com.android.dx.util._tests;
+package com.android.dx.util;
-import com.android.dx.util.BitIntSet;
-import com.android.dx.util.IntIterator;
-import com.android.dx.util.ListIntSet;
import java.util.NoSuchElementException;
import junit.framework.TestCase;
diff --git a/dx/junit-tests/com/android/dx/util/BitsTest.java b/dx/junit-tests/com/android/dx/util/BitsTest.java
index 5cf2b6f..e427513 100644
--- a/dx/junit-tests/com/android/dx/util/BitsTest.java
+++ b/dx/junit-tests/com/android/dx/util/BitsTest.java
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package com.android.dx.util._tests;
+package com.android.dx.util;
-import com.android.dx.util.Bits;
import junit.framework.TestCase;
public final class BitsTest extends TestCase {
diff --git a/dx/junit-tests/com/android/dx/util/IntListTest.java b/dx/junit-tests/com/android/dx/util/IntListTest.java
index 8b72da1..7a53a67 100644
--- a/dx/junit-tests/com/android/dx/util/IntListTest.java
+++ b/dx/junit-tests/com/android/dx/util/IntListTest.java
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package com.android.dx.util._tests;
+package com.android.dx.util;
-import com.android.dx.util.IntList;
import junit.framework.TestCase;
public final class IntListTest extends TestCase {
diff --git a/dx/junit-tests/com/android/dx/util/ListIntSetTest.java b/dx/junit-tests/com/android/dx/util/ListIntSetTest.java
index dd72b6b..868e630 100644
--- a/dx/junit-tests/com/android/dx/util/ListIntSetTest.java
+++ b/dx/junit-tests/com/android/dx/util/ListIntSetTest.java
@@ -14,11 +14,8 @@
* limitations under the License.
*/
-package com.android.dx.util._tests;
+package com.android.dx.util;
-import com.android.dx.util.BitIntSet;
-import com.android.dx.util.IntIterator;
-import com.android.dx.util.ListIntSet;
import java.util.NoSuchElementException;
import junit.framework.TestCase;
