diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-09-16 23:10:02 -0400 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-30 10:40:28 -0700 |
| commit | fe107fb6e3f308ac5174ebdc5a794ee880c741d9 (patch) | |
| tree | fd0822f92e26ddd0ed279caccd4e4a3b674458a7 /dx/src/com/android/dx/cf/code/Frame.java | |
| parent | fd2a1f6f7f56fb9e98bb4c1023ccdc7f7ce6c5d2 (diff) | |
| download | android_dalvik-fe107fb6e3f308ac5174ebdc5a794ee880c741d9.tar.gz android_dalvik-fe107fb6e3f308ac5174ebdc5a794ee880c741d9.tar.bz2 android_dalvik-fe107fb6e3f308ac5174ebdc5a794ee880c741d9.zip | |
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
Diffstat (limited to 'dx/src/com/android/dx/cf/code/Frame.java')
| -rw-r--r-- | dx/src/com/android/dx/cf/code/Frame.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dx/src/com/android/dx/cf/code/Frame.java b/dx/src/com/android/dx/cf/code/Frame.java index 002a4fbc1..cb32b92d9 100644 --- a/dx/src/com/android/dx/cf/code/Frame.java +++ b/dx/src/com/android/dx/cf/code/Frame.java @@ -16,10 +16,10 @@ package com.android.dx.cf.code; +import com.android.dex.util.ExceptionWithContext; import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.StdTypeList; import com.android.dx.rop.type.Type; -import com.android.dx.util.ExceptionWithContext; import com.android.dx.util.IntList; /** |