9fd92c537edef48f3a8e665e727eadca61480dcd |
|
09-Dec-2011 |
Jesse Wilson <jessewilson@google.com> |
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
|
fe107fb6e3f308ac5174ebdc5a794ee880c741d9 |
|
17-Sep-2011 |
Jesse Wilson <jessewilson@google.com> |
Mechanical refactoring of dx into two parts. This splits off a new package, com.android.dex that contains code for parsing and modelling dex files. This code is usable both at build time (for compilation and analysis) and at runtime (for introspection). The original package, com.android.dx is the tool that compiles .class files into .dex files. That package also includes utilities for merging and querying dex files, all visible to the dx command line application. In a follow up change I'll move the new com.android.dex package into the libcore/ project, and configure build rules so that it's included in both dx.jar and core.jar. The core.jar will then be able to use it for annotation processing. Change-Id: I3c58cf87e728e4dda1925a0992c1ee7b8130e81a (cherry picked from commit bab4abb07335d162ecdb8091fc395cf84803a580) Conflicts: dx/junit-tests/com/android/dx/util/BitIntSetTest.java dx/junit-tests/com/android/dx/util/BitsTest.java dx/junit-tests/com/android/dx/util/IntListTest.java dx/junit-tests/com/android/dx/util/ListIntSetTest.java dx/src/com/android/dex/Dex.java dx/src/com/android/dex/TableOfContents.java dx/src/com/android/dx/annotations/AnnotationAccess.java dx/src/com/android/dx/command/Main.java dx/src/com/android/dx/dex/code/OutputFinisher.java dx/src/com/android/dx/dex/code/form/Form32s.java dx/src/com/android/dx/dex/code/form/Form33x.java dx/src/com/android/dx/dex/code/form/Form41c.java dx/src/com/android/dx/dex/code/form/Form52c.java dx/src/com/android/dx/gen/DexGenerator.java dx/src/com/android/dx/merge/DexMerger.java
|
4cd7b39876bcec03bb1d0c2afa61cbdb7d119eba |
|
09-Dec-2011 |
Jesse Wilson <jessewilson@google.com> |
Remove dx's copy of JUnit. Instead, use JUnit the same way other code uses JUnit: by depending on the copy in external. There is no longer a top-level option in dx to run JUnit tests on itself. There are two failing tests in dx/junit-tests. Both of these are in the recently created DexGeneratorTest; I intend to fix these in another change. Bug: http://b/2286423 Change-Id: I3a173a0302c7ccc81be3b5a2a4d766000d1c242b
|