aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-08-03 12:16:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-03 12:16:02 +0000
commitbceb86b63ece54ea97f1c733966a68f82bf6eb39 (patch)
tree284987f85d66d843fca1d13bc7d5d5cffdaa0797
parent05f9a0eff07ee63ce4f0cfc55434a9e3dad8d6bc (diff)
parent7a486869747f1f3bf203016d826fa97cc107955a (diff)
downloaddexmaker-bceb86b63ece54ea97f1c733966a68f82bf6eb39.tar.gz
Merge changes from topic 'upgrade-mockito-1.10.19-dexmaker-1.3' am: f3da964da8
am: 7a48686974 Change-Id: Icbd06b78fd2da7207a06368c73c1e4ba0024104c
Diffstat
-rw-r--r--Android.mk6
-rw-r--r--LICENSE.txt202
-rw-r--r--README.android (renamed from README)18
-rw-r--r--README.md137
-rw-r--r--bug-10862083.patch16
-rw-r--r--bug-8108255.patch6
-rw-r--r--dexmaker/pom.xml76
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/AppDataDirGuesser.java (renamed from src/main/java/com/google/dexmaker/AppDataDirGuesser.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/BinaryOp.java (renamed from src/main/java/com/google/dexmaker/BinaryOp.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/Code.java (renamed from src/main/java/com/google/dexmaker/Code.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/Comparison.java (renamed from src/main/java/com/google/dexmaker/Comparison.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/Constants.java (renamed from src/main/java/com/google/dexmaker/Constants.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/DexMaker.java (renamed from src/main/java/com/google/dexmaker/DexMaker.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/FieldId.java (renamed from src/main/java/com/google/dexmaker/FieldId.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/Label.java (renamed from src/main/java/com/google/dexmaker/Label.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/Local.java (renamed from src/main/java/com/google/dexmaker/Local.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/MethodId.java (renamed from src/main/java/com/google/dexmaker/MethodId.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/TypeId.java (renamed from src/main/java/com/google/dexmaker/TypeId.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/TypeList.java (renamed from src/main/java/com/google/dexmaker/TypeList.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/UnaryOp.java (renamed from src/main/java/com/google/dexmaker/UnaryOp.java)0
-rw-r--r--dexmaker/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java (renamed from src/main/java/com/google/dexmaker/stock/ProxyBuilder.java)72
-rw-r--r--dexmaker/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java (renamed from src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java)0
-rw-r--r--dexmaker/src/test/java/com/google/dexmaker/DexMakerTest.java (renamed from src/test/java/com/google/dexmaker/DexMakerTest.java)0
-rw-r--r--dexmaker/src/test/java/com/google/dexmaker/TypeIdTest.java (renamed from src/test/java/com/google/dexmaker/TypeIdTest.java)0
-rw-r--r--dexmaker/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java (renamed from src/test/java/com/google/dexmaker/examples/FibonacciMaker.java)0
-rw-r--r--dexmaker/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java (renamed from src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java)0
-rw-r--r--dexmaker/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java (renamed from src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java)71
-rw-r--r--dx/pom.xml39
-rw-r--r--dx/src/main/java/com/android/dx/Version.java (renamed from src/dx/java/com/android/dx/Version.java)0
-rw-r--r--dx/src/main/java/com/android/dx/cf/code/Merger.java (renamed from src/dx/java/com/android/dx/cf/code/Merger.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/DexFormat.java (renamed from src/dx/java/com/android/dx/dex/DexFormat.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/DexOptions.java (renamed from src/dx/java/com/android/dx/dex/DexOptions.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/SizeOf.java (renamed from src/dx/java/com/android/dx/dex/SizeOf.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/ArrayData.java (renamed from src/dx/java/com/android/dx/dex/code/ArrayData.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/BlockAddresses.java (renamed from src/dx/java/com/android/dx/dex/code/BlockAddresses.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/CatchBuilder.java (renamed from src/dx/java/com/android/dx/dex/code/CatchBuilder.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/CatchHandlerList.java (renamed from src/dx/java/com/android/dx/dex/code/CatchHandlerList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/CatchTable.java (renamed from src/dx/java/com/android/dx/dex/code/CatchTable.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/CodeAddress.java (renamed from src/dx/java/com/android/dx/dex/code/CodeAddress.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/CstInsn.java (renamed from src/dx/java/com/android/dx/dex/code/CstInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/DalvCode.java (renamed from src/dx/java/com/android/dx/dex/code/DalvCode.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/DalvInsn.java (renamed from src/dx/java/com/android/dx/dex/code/DalvInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/DalvInsnList.java (renamed from src/dx/java/com/android/dx/dex/code/DalvInsnList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/Dop.java (renamed from src/dx/java/com/android/dx/dex/code/Dop.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/Dops.java (renamed from src/dx/java/com/android/dx/dex/code/Dops.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/FixedSizeInsn.java (renamed from src/dx/java/com/android/dx/dex/code/FixedSizeInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/HighRegisterPrefix.java (renamed from src/dx/java/com/android/dx/dex/code/HighRegisterPrefix.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/InsnFormat.java (renamed from src/dx/java/com/android/dx/dex/code/InsnFormat.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/LocalEnd.java (renamed from src/dx/java/com/android/dx/dex/code/LocalEnd.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/LocalList.java (renamed from src/dx/java/com/android/dx/dex/code/LocalList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/LocalSnapshot.java (renamed from src/dx/java/com/android/dx/dex/code/LocalSnapshot.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/LocalStart.java (renamed from src/dx/java/com/android/dx/dex/code/LocalStart.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/OddSpacer.java (renamed from src/dx/java/com/android/dx/dex/code/OddSpacer.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/OutputCollector.java (renamed from src/dx/java/com/android/dx/dex/code/OutputCollector.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/OutputFinisher.java (renamed from src/dx/java/com/android/dx/dex/code/OutputFinisher.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/PositionList.java (renamed from src/dx/java/com/android/dx/dex/code/PositionList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/RopToDop.java (renamed from src/dx/java/com/android/dx/dex/code/RopToDop.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/RopTranslator.java (renamed from src/dx/java/com/android/dx/dex/code/RopTranslator.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/SimpleInsn.java (renamed from src/dx/java/com/android/dx/dex/code/SimpleInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/StdCatchBuilder.java (renamed from src/dx/java/com/android/dx/dex/code/StdCatchBuilder.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/SwitchData.java (renamed from src/dx/java/com/android/dx/dex/code/SwitchData.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/TargetInsn.java (renamed from src/dx/java/com/android/dx/dex/code/TargetInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/VariableSizeInsn.java (renamed from src/dx/java/com/android/dx/dex/code/VariableSizeInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/ZeroSizeInsn.java (renamed from src/dx/java/com/android/dx/dex/code/ZeroSizeInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form10t.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form10t.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form10x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form10x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form11n.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form11n.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form11x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form11x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form12x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form12x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form20t.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form20t.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form21c.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form21c.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form21h.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form21h.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form21s.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form21s.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form21t.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form21t.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form22b.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form22b.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form22c.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form22c.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form22s.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form22s.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form22t.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form22t.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form22x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form22x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form23x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form23x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form30t.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form30t.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form31c.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form31c.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form31i.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form31i.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form31t.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form31t.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form32s.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form32s.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form32x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form32x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form33x.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form33x.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form35c.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form35c.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form3rc.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form3rc.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form41c.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form41c.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form51l.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form51l.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form52c.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form52c.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/Form5rc.java (renamed from src/dx/java/com/android/dx/dex/code/form/Form5rc.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/code/form/SpecialFormat.java (renamed from src/dx/java/com/android/dx/dex/code/form/SpecialFormat.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/AnnotationItem.java (renamed from src/dx/java/com/android/dx/dex/file/AnnotationItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/AnnotationSetItem.java (renamed from src/dx/java/com/android/dx/dex/file/AnnotationSetItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/AnnotationSetRefItem.java (renamed from src/dx/java/com/android/dx/dex/file/AnnotationSetRefItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/AnnotationUtils.java (renamed from src/dx/java/com/android/dx/dex/file/AnnotationUtils.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java (renamed from src/dx/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/CatchStructs.java (renamed from src/dx/java/com/android/dx/dex/file/CatchStructs.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ClassDataItem.java (renamed from src/dx/java/com/android/dx/dex/file/ClassDataItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ClassDefItem.java (renamed from src/dx/java/com/android/dx/dex/file/ClassDefItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ClassDefsSection.java (renamed from src/dx/java/com/android/dx/dex/file/ClassDefsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/CodeItem.java (renamed from src/dx/java/com/android/dx/dex/file/CodeItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/DebugInfoConstants.java (renamed from src/dx/java/com/android/dx/dex/file/DebugInfoConstants.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/DebugInfoDecoder.java (renamed from src/dx/java/com/android/dx/dex/file/DebugInfoDecoder.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/DebugInfoEncoder.java (renamed from src/dx/java/com/android/dx/dex/file/DebugInfoEncoder.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/DebugInfoItem.java (renamed from src/dx/java/com/android/dx/dex/file/DebugInfoItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/DexFile.java (renamed from src/dx/java/com/android/dx/dex/file/DexFile.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/EncodedArrayItem.java (renamed from src/dx/java/com/android/dx/dex/file/EncodedArrayItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/EncodedField.java (renamed from src/dx/java/com/android/dx/dex/file/EncodedField.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/EncodedMember.java (renamed from src/dx/java/com/android/dx/dex/file/EncodedMember.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/EncodedMethod.java (renamed from src/dx/java/com/android/dx/dex/file/EncodedMethod.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/FieldAnnotationStruct.java (renamed from src/dx/java/com/android/dx/dex/file/FieldAnnotationStruct.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/FieldIdItem.java (renamed from src/dx/java/com/android/dx/dex/file/FieldIdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/FieldIdsSection.java (renamed from src/dx/java/com/android/dx/dex/file/FieldIdsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/HeaderItem.java (renamed from src/dx/java/com/android/dx/dex/file/HeaderItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/HeaderSection.java (renamed from src/dx/java/com/android/dx/dex/file/HeaderSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/IdItem.java (renamed from src/dx/java/com/android/dx/dex/file/IdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/IndexedItem.java (renamed from src/dx/java/com/android/dx/dex/file/IndexedItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/Item.java (renamed from src/dx/java/com/android/dx/dex/file/Item.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ItemType.java (renamed from src/dx/java/com/android/dx/dex/file/ItemType.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MapItem.java (renamed from src/dx/java/com/android/dx/dex/file/MapItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MemberIdItem.java (renamed from src/dx/java/com/android/dx/dex/file/MemberIdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MemberIdsSection.java (renamed from src/dx/java/com/android/dx/dex/file/MemberIdsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MethodAnnotationStruct.java (renamed from src/dx/java/com/android/dx/dex/file/MethodAnnotationStruct.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MethodIdItem.java (renamed from src/dx/java/com/android/dx/dex/file/MethodIdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MethodIdsSection.java (renamed from src/dx/java/com/android/dx/dex/file/MethodIdsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/MixedItemSection.java (renamed from src/dx/java/com/android/dx/dex/file/MixedItemSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/OffsettedItem.java (renamed from src/dx/java/com/android/dx/dex/file/OffsettedItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ParameterAnnotationStruct.java (renamed from src/dx/java/com/android/dx/dex/file/ParameterAnnotationStruct.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ProtoIdItem.java (renamed from src/dx/java/com/android/dx/dex/file/ProtoIdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ProtoIdsSection.java (renamed from src/dx/java/com/android/dx/dex/file/ProtoIdsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/Section.java (renamed from src/dx/java/com/android/dx/dex/file/Section.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/Statistics.java (renamed from src/dx/java/com/android/dx/dex/file/Statistics.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/StringDataItem.java (renamed from src/dx/java/com/android/dx/dex/file/StringDataItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/StringIdItem.java (renamed from src/dx/java/com/android/dx/dex/file/StringIdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/StringIdsSection.java (renamed from src/dx/java/com/android/dx/dex/file/StringIdsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/TypeIdItem.java (renamed from src/dx/java/com/android/dx/dex/file/TypeIdItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/TypeIdsSection.java (renamed from src/dx/java/com/android/dx/dex/file/TypeIdsSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/TypeListItem.java (renamed from src/dx/java/com/android/dx/dex/file/TypeListItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/UniformItemSection.java (renamed from src/dx/java/com/android/dx/dex/file/UniformItemSection.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/UniformListItem.java (renamed from src/dx/java/com/android/dx/dex/file/UniformListItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/dex/file/ValueEncoder.java (renamed from src/dx/java/com/android/dx/dex/file/ValueEncoder.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/Code.java (renamed from src/dx/java/com/android/dx/io/Code.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/CodeReader.java (renamed from src/dx/java/com/android/dx/io/CodeReader.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/IndexType.java (renamed from src/dx/java/com/android/dx/io/IndexType.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/OpcodeInfo.java (renamed from src/dx/java/com/android/dx/io/OpcodeInfo.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/Opcodes.java (renamed from src/dx/java/com/android/dx/io/Opcodes.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/AddressMap.java (renamed from src/dx/java/com/android/dx/io/instructions/AddressMap.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/BaseCodeCursor.java (renamed from src/dx/java/com/android/dx/io/instructions/BaseCodeCursor.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/CodeCursor.java (renamed from src/dx/java/com/android/dx/io/instructions/CodeCursor.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/CodeInput.java (renamed from src/dx/java/com/android/dx/io/instructions/CodeInput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/CodeOutput.java (renamed from src/dx/java/com/android/dx/io/instructions/CodeOutput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/DecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/DecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/InstructionCodec.java (renamed from src/dx/java/com/android/dx/io/instructions/InstructionCodec.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeInput.java (renamed from src/dx/java/com/android/dx/io/instructions/ShortArrayCodeInput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java (renamed from src/dx/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java (renamed from src/dx/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/annotation/Annotation.java (renamed from src/dx/java/com/android/dx/rop/annotation/Annotation.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/annotation/AnnotationVisibility.java (renamed from src/dx/java/com/android/dx/rop/annotation/AnnotationVisibility.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/annotation/Annotations.java (renamed from src/dx/java/com/android/dx/rop/annotation/Annotations.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/annotation/AnnotationsList.java (renamed from src/dx/java/com/android/dx/rop/annotation/AnnotationsList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/annotation/NameValuePair.java (renamed from src/dx/java/com/android/dx/rop/annotation/NameValuePair.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/AccessFlags.java (renamed from src/dx/java/com/android/dx/rop/code/AccessFlags.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/BasicBlock.java (renamed from src/dx/java/com/android/dx/rop/code/BasicBlock.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/BasicBlockList.java (renamed from src/dx/java/com/android/dx/rop/code/BasicBlockList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java (renamed from src/dx/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/CstInsn.java (renamed from src/dx/java/com/android/dx/rop/code/CstInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/DexTranslationAdvice.java (renamed from src/dx/java/com/android/dx/rop/code/DexTranslationAdvice.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/Exceptions.java (renamed from src/dx/java/com/android/dx/rop/code/Exceptions.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/FillArrayDataInsn.java (renamed from src/dx/java/com/android/dx/rop/code/FillArrayDataInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/Insn.java (renamed from src/dx/java/com/android/dx/rop/code/Insn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/InsnList.java (renamed from src/dx/java/com/android/dx/rop/code/InsnList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/LocalItem.java (renamed from src/dx/java/com/android/dx/rop/code/LocalItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/LocalVariableExtractor.java (renamed from src/dx/java/com/android/dx/rop/code/LocalVariableExtractor.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/LocalVariableInfo.java (renamed from src/dx/java/com/android/dx/rop/code/LocalVariableInfo.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/PlainCstInsn.java (renamed from src/dx/java/com/android/dx/rop/code/PlainCstInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/PlainInsn.java (renamed from src/dx/java/com/android/dx/rop/code/PlainInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/RegOps.java (renamed from src/dx/java/com/android/dx/rop/code/RegOps.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/RegisterSpec.java (renamed from src/dx/java/com/android/dx/rop/code/RegisterSpec.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/RegisterSpecList.java (renamed from src/dx/java/com/android/dx/rop/code/RegisterSpecList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/RegisterSpecSet.java (renamed from src/dx/java/com/android/dx/rop/code/RegisterSpecSet.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/Rop.java (renamed from src/dx/java/com/android/dx/rop/code/Rop.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/RopMethod.java (renamed from src/dx/java/com/android/dx/rop/code/RopMethod.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/Rops.java (renamed from src/dx/java/com/android/dx/rop/code/Rops.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/SourcePosition.java (renamed from src/dx/java/com/android/dx/rop/code/SourcePosition.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/SwitchInsn.java (renamed from src/dx/java/com/android/dx/rop/code/SwitchInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/ThrowingCstInsn.java (renamed from src/dx/java/com/android/dx/rop/code/ThrowingCstInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/ThrowingInsn.java (renamed from src/dx/java/com/android/dx/rop/code/ThrowingInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/code/TranslationAdvice.java (renamed from src/dx/java/com/android/dx/rop/code/TranslationAdvice.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/Constant.java (renamed from src/dx/java/com/android/dx/rop/cst/Constant.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/ConstantPool.java (renamed from src/dx/java/com/android/dx/rop/cst/ConstantPool.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstAnnotation.java (renamed from src/dx/java/com/android/dx/rop/cst/CstAnnotation.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstArray.java (renamed from src/dx/java/com/android/dx/rop/cst/CstArray.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstBaseMethodRef.java (renamed from src/dx/java/com/android/dx/rop/cst/CstBaseMethodRef.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstBoolean.java (renamed from src/dx/java/com/android/dx/rop/cst/CstBoolean.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstByte.java (renamed from src/dx/java/com/android/dx/rop/cst/CstByte.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstChar.java (renamed from src/dx/java/com/android/dx/rop/cst/CstChar.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstDouble.java (renamed from src/dx/java/com/android/dx/rop/cst/CstDouble.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstEnumRef.java (renamed from src/dx/java/com/android/dx/rop/cst/CstEnumRef.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstFieldRef.java (renamed from src/dx/java/com/android/dx/rop/cst/CstFieldRef.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstFloat.java (renamed from src/dx/java/com/android/dx/rop/cst/CstFloat.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstInteger.java (renamed from src/dx/java/com/android/dx/rop/cst/CstInteger.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java (renamed from src/dx/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstKnownNull.java (renamed from src/dx/java/com/android/dx/rop/cst/CstKnownNull.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstLiteral32.java (renamed from src/dx/java/com/android/dx/rop/cst/CstLiteral32.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstLiteral64.java (renamed from src/dx/java/com/android/dx/rop/cst/CstLiteral64.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstLiteralBits.java (renamed from src/dx/java/com/android/dx/rop/cst/CstLiteralBits.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstLong.java (renamed from src/dx/java/com/android/dx/rop/cst/CstLong.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstMemberRef.java (renamed from src/dx/java/com/android/dx/rop/cst/CstMemberRef.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstMethodRef.java (renamed from src/dx/java/com/android/dx/rop/cst/CstMethodRef.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstNat.java (renamed from src/dx/java/com/android/dx/rop/cst/CstNat.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstShort.java (renamed from src/dx/java/com/android/dx/rop/cst/CstShort.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstString.java (renamed from src/dx/java/com/android/dx/rop/cst/CstString.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/CstType.java (renamed from src/dx/java/com/android/dx/rop/cst/CstType.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/StdConstantPool.java (renamed from src/dx/java/com/android/dx/rop/cst/StdConstantPool.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/TypedConstant.java (renamed from src/dx/java/com/android/dx/rop/cst/TypedConstant.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/cst/Zeroes.java (renamed from src/dx/java/com/android/dx/rop/cst/Zeroes.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/type/Prototype.java (renamed from src/dx/java/com/android/dx/rop/type/Prototype.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/type/StdTypeList.java (renamed from src/dx/java/com/android/dx/rop/type/StdTypeList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/type/Type.java (renamed from src/dx/java/com/android/dx/rop/type/Type.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/type/TypeBearer.java (renamed from src/dx/java/com/android/dx/rop/type/TypeBearer.java)0
-rw-r--r--dx/src/main/java/com/android/dx/rop/type/TypeList.java (renamed from src/dx/java/com/android/dx/rop/type/TypeList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/BasicRegisterMapper.java (renamed from src/dx/java/com/android/dx/ssa/BasicRegisterMapper.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/ConstCollector.java (renamed from src/dx/java/com/android/dx/ssa/ConstCollector.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/DeadCodeRemover.java (renamed from src/dx/java/com/android/dx/ssa/DeadCodeRemover.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/DomFront.java (renamed from src/dx/java/com/android/dx/ssa/DomFront.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/Dominators.java (renamed from src/dx/java/com/android/dx/ssa/Dominators.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/EscapeAnalysis.java (renamed from src/dx/java/com/android/dx/ssa/EscapeAnalysis.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/InterferenceRegisterMapper.java (renamed from src/dx/java/com/android/dx/ssa/InterferenceRegisterMapper.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/LiteralOpUpgrader.java (renamed from src/dx/java/com/android/dx/ssa/LiteralOpUpgrader.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/LocalVariableExtractor.java (renamed from src/dx/java/com/android/dx/ssa/LocalVariableExtractor.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/LocalVariableInfo.java (renamed from src/dx/java/com/android/dx/ssa/LocalVariableInfo.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/MoveParamCombiner.java (renamed from src/dx/java/com/android/dx/ssa/MoveParamCombiner.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/NormalSsaInsn.java (renamed from src/dx/java/com/android/dx/ssa/NormalSsaInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/Optimizer.java (renamed from src/dx/java/com/android/dx/ssa/Optimizer.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/PhiInsn.java (renamed from src/dx/java/com/android/dx/ssa/PhiInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/PhiTypeResolver.java (renamed from src/dx/java/com/android/dx/ssa/PhiTypeResolver.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/RegisterMapper.java (renamed from src/dx/java/com/android/dx/ssa/RegisterMapper.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SCCP.java (renamed from src/dx/java/com/android/dx/ssa/SCCP.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SetFactory.java (renamed from src/dx/java/com/android/dx/ssa/SetFactory.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SsaBasicBlock.java (renamed from src/dx/java/com/android/dx/ssa/SsaBasicBlock.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SsaConverter.java (renamed from src/dx/java/com/android/dx/ssa/SsaConverter.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SsaInsn.java (renamed from src/dx/java/com/android/dx/ssa/SsaInsn.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SsaMethod.java (renamed from src/dx/java/com/android/dx/ssa/SsaMethod.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/SsaRenamer.java (renamed from src/dx/java/com/android/dx/ssa/SsaRenamer.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/FirstFitAllocator.java (renamed from src/dx/java/com/android/dx/ssa/back/FirstFitAllocator.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java (renamed from src/dx/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java (renamed from src/dx/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/InterferenceGraph.java (renamed from src/dx/java/com/android/dx/ssa/back/InterferenceGraph.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/LivenessAnalyzer.java (renamed from src/dx/java/com/android/dx/ssa/back/LivenessAnalyzer.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/NullRegisterAllocator.java (renamed from src/dx/java/com/android/dx/ssa/back/NullRegisterAllocator.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/RegisterAllocator.java (renamed from src/dx/java/com/android/dx/ssa/back/RegisterAllocator.java)0
-rw-r--r--dx/src/main/java/com/android/dx/ssa/back/SsaToRop.java (renamed from src/dx/java/com/android/dx/ssa/back/SsaToRop.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/AnnotatedOutput.java (renamed from src/dx/java/com/android/dx/util/AnnotatedOutput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/BitIntSet.java (renamed from src/dx/java/com/android/dx/util/BitIntSet.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Bits.java (renamed from src/dx/java/com/android/dx/util/Bits.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ByteArray.java (renamed from src/dx/java/com/android/dx/util/ByteArray.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ByteArrayAnnotatedOutput.java (renamed from src/dx/java/com/android/dx/util/ByteArrayAnnotatedOutput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ByteArrayByteInput.java (renamed from src/dx/java/com/android/dx/util/ByteArrayByteInput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ByteInput.java (renamed from src/dx/java/com/android/dx/util/ByteInput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ByteOutput.java (renamed from src/dx/java/com/android/dx/util/ByteOutput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/DexException.java (renamed from src/dx/java/com/android/dx/util/DexException.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ExceptionWithContext.java (renamed from src/dx/java/com/android/dx/util/ExceptionWithContext.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/FileUtils.java (renamed from src/dx/java/com/android/dx/util/FileUtils.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/FixedSizeList.java (renamed from src/dx/java/com/android/dx/util/FixedSizeList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Hex.java (renamed from src/dx/java/com/android/dx/util/Hex.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/HexParser.java (renamed from src/dx/java/com/android/dx/util/HexParser.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/IndentingWriter.java (renamed from src/dx/java/com/android/dx/util/IndentingWriter.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/IntIterator.java (renamed from src/dx/java/com/android/dx/util/IntIterator.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/IntList.java (renamed from src/dx/java/com/android/dx/util/IntList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/IntSet.java (renamed from src/dx/java/com/android/dx/util/IntSet.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/LabeledItem.java (renamed from src/dx/java/com/android/dx/util/LabeledItem.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/LabeledList.java (renamed from src/dx/java/com/android/dx/util/LabeledList.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Leb128Utils.java (renamed from src/dx/java/com/android/dx/util/Leb128Utils.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ListIntSet.java (renamed from src/dx/java/com/android/dx/util/ListIntSet.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/MutabilityControl.java (renamed from src/dx/java/com/android/dx/util/MutabilityControl.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/MutabilityException.java (renamed from src/dx/java/com/android/dx/util/MutabilityException.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Mutf8.java (renamed from src/dx/java/com/android/dx/util/Mutf8.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Output.java (renamed from src/dx/java/com/android/dx/util/Output.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/ToHuman.java (renamed from src/dx/java/com/android/dx/util/ToHuman.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/TwoColumnOutput.java (renamed from src/dx/java/com/android/dx/util/TwoColumnOutput.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Uint.java (renamed from src/dx/java/com/android/dx/util/Uint.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Unsigned.java (renamed from src/dx/java/com/android/dx/util/Unsigned.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Warning.java (renamed from src/dx/java/com/android/dx/util/Warning.java)0
-rw-r--r--dx/src/main/java/com/android/dx/util/Writers.java (renamed from src/dx/java/com/android/dx/util/Writers.java)0
-rw-r--r--mockito/pom.xml52
-rw-r--r--mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java (renamed from src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java)5
-rw-r--r--mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java (renamed from src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java)6
-rw-r--r--mockito/src/main/java/com/google/dexmaker/mockito/UnsafeAllocator.java (renamed from src/mockito/java/com/google/dexmaker/mockito/UnsafeAllocator.java)0
-rw-r--r--mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker (renamed from src/mockito/resources/mockito-extensions/org.mockito.plugins.MockMaker)0
-rw-r--r--mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider (renamed from src/mockito/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider)0
-rw-r--r--pom.xml177
303 files changed, 821 insertions, 62 deletions
diff --git a/Android.mk b/Android.mk
index 7314e6f..f3eb828 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java src/dx/java)
+LOCAL_SRC_FILES := $(call all-java-files-under, dexmaker/src/main/java dx/src/main/java)
LOCAL_SDK_VERSION := 10
@@ -30,7 +30,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := dexmaker-mockmaker
LOCAL_SDK_VERSION := 10
-LOCAL_SRC_FILES := $(call all-java-files-under, src/mockito/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/mockito/resources
+LOCAL_SRC_FILES := $(call all-java-files-under, mockito/src/main/java)
+LOCAL_JAVA_RESOURCE_DIRS := mockito/src/main/resources
LOCAL_JAVA_LIBRARIES := dexmaker mockito-api
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/README b/README.android
index 74fd815..b9485fd 100644
--- a/README
+++ b/README.android
@@ -1,13 +1,8 @@
-This folder contains the dexmaker library.
-
-The latest version of dexmaker can be found at this url:
- http://code.google.com/p/dexmaker/
-
-Version: f54f6eac0c81120f53265b30adf9ce602e8dfc41
+URL: https://github.com/crittercism/dexmaker/
+Version: v1.3
License: Apache 2.0
-
Description:
-A Java-language API for doing compile time or runtime code generation targeting the Dalvik VM. Unlike cglib or ASM, this library creates Dalvik .dex files instead of Java .class files.
+Dexmaker is a Java-language API for doing compile time or runtime code generation targeting the Dalvik VM. Unlike cglib or ASM, this library creates Dalvik .dex files instead of Java .class files.
It has a small, close-to-the-metal API. This API mirrors the Dalvik bytecode specification giving you tight control over the bytecode emitted. Code is generated instruction-by-instruction; you bring your own abstract syntax tree if you need one. And since it uses Dalvik's dx tool as a backend, you get efficient register allocation and regular/wide instruction selection for free.
@@ -16,9 +11,6 @@ It includes a stock code generator for class proxies. If you just want to do AOP
Local Modifications:
bug-8108255.patch: temporary workaround to ClassLoading issues
(see https://code.google.com/p/dexmaker/issues/detail?id=20)
-bug-10862083.patch: Do not assert that InvocationHandler.invoke args should be non-null
- (see https://code.google.com/p/dexmaker/issues/detail?id=27)
-
-to apply, run 'patch -p0 < bug-xyz.patch' from a fresh src
-to remove, use 'patch -p0 -R < bug-xyz.patch'
+to apply, run 'patch -p1 < bug-xyz.patch' from a fresh src
+to remove, use 'patch -p1 -R < bug-xyz.patch'
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a2e0b8a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,137 @@
+A Java-language API for doing compile time or runtime code generation targeting the Dalvik VM. Unlike
+[cglib](http://cglib.sourceforge.net/) or [ASM](http://asm.ow2.org/), this library creates Dalvik `.dex`
+files instead of Java `.class` files.
+
+It has a small, close-to-the-metal API. This API mirrors the
+[Dalvik bytecode specification](http://source.android.com/tech/dalvik/dalvik-bytecode.html) giving you tight
+control over the bytecode emitted. Code is generated instruction-by-instruction; you bring your own abstract
+syntax tree if you need one. And since it uses Dalvik's `dx` tool as a backend, you get efficient register
+allocation and regular/wide instruction selection for free.
+
+Class Proxies
+-------------
+
+Dexmaker includes a stock code generator for [class proxies](http://dexmaker.googlecode.com/git/javadoc/com/google/dexmaker/stock/ProxyBuilder.html).
+If you just want to do AOP or class mocking, you don't need to mess around with bytecodes.
+
+Mockito Mocks
+-------------
+
+Dexmaker includes class proxy support for [Mockito](http://code.google.com/p/mockito/). Add the mockito
+and the dexmaker `.jar` files to your Android test project's `libs/` directory and you can use Mockito
+in your Android unit tests.
+
+This requires Mockito 1.10.5 or newer.
+
+Runtime Code Generation
+-----------------------
+
+This example generates a class and a method. It then loads that class into the current process and invokes its method.
+```
+public final class HelloWorldMaker {
+ public static void main(String[] args) throws Exception {
+ DexMaker dexMaker = new DexMaker();
+
+ // Generate a HelloWorld class.
+ TypeId<?> helloWorld = TypeId.get("LHelloWorld;");
+ dexMaker.declare(helloWorld, "HelloWorld.generated", Modifier.PUBLIC, TypeId.OBJECT);
+ generateHelloMethod(dexMaker, helloWorld);
+
+ // Create the dex file and load it.
+ File outputDir = new File(".");
+ ClassLoader loader = dexMaker.generateAndLoad(HelloWorldMaker.class.getClassLoader(),
+ outputDir, outputDir);
+ Class<?> helloWorldClass = loader.loadClass("HelloWorld");
+
+ // Execute our newly-generated code in-process.
+ helloWorldClass.getMethod("hello").invoke(null);
+ }
+
+ /**
+ * Generates Dalvik bytecode equivalent to the following method.
+ * public static void hello() {
+ * int a = 0xabcd;
+ * int b = 0xaaaa;
+ * int c = a - b;
+ * String s = Integer.toHexString(c);
+ * System.out.println(s);
+ * return;
+ * }
+ */
+ private static void generateHelloMethod(DexMaker dexMaker, TypeId<?> declaringType) {
+ // Lookup some types we'll need along the way.
+ TypeId<System> systemType = TypeId.get(System.class);
+ TypeId<PrintStream> printStreamType = TypeId.get(PrintStream.class);
+
+ // Identify the 'hello()' method on declaringType.
+ MethodId hello = declaringType.getMethod(TypeId.VOID, "hello");
+
+ // Declare that method on the dexMaker. Use the returned Code instance
+ // as a builder that we can append instructions to.
+ Code code = dexMaker.declare(hello, Modifier.STATIC | Modifier.PUBLIC);
+
+ // Declare all the locals we'll need up front. The API requires this.
+ Local<Integer> a = code.newLocal(TypeId.INT);
+ Local<Integer> b = code.newLocal(TypeId.INT);
+ Local<Integer> c = code.newLocal(TypeId.INT);
+ Local<String> s = code.newLocal(TypeId.STRING);
+ Local<PrintStream> localSystemOut = code.newLocal(printStreamType);
+
+ // int a = 0xabcd;
+ code.loadConstant(a, 0xabcd);
+
+ // int b = 0xaaaa;
+ code.loadConstant(b, 0xaaaa);
+
+ // int c = a - b;
+ code.op(BinaryOp.SUBTRACT, c, a, b);
+
+ // String s = Integer.toHexString(c);
+ MethodId<Integer, String> toHexString
+ = TypeId.get(Integer.class).getMethod(TypeId.STRING, "toHexString", TypeId.INT);
+ code.invokeStatic(toHexString, s, c);
+
+ // System.out.println(s);
+ FieldId<System, PrintStream> systemOutField = systemType.getField(printStreamType, "out");
+ code.sget(systemOutField, localSystemOut);
+ MethodId<PrintStream, Void> printlnMethod = printStreamType.getMethod(
+ TypeId.VOID, "println", TypeId.STRING);
+ code.invokeVirtual(printlnMethod, null, localSystemOut, s);
+
+ // return;
+ code.returnVoid();
+ }
+}
+```
+
+Use it in your app
+------------------
+
+Maven users can get dexmaker from Sonatype's central repository. The Mockito dependency is optional.
+
+```
+ <dependency>
+ <groupId>com.google.dexmaker</groupId>
+ <artifactId>dexmaker</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.dexmaker</groupId>
+ <artifactId>dexmaker-mockito</artifactId>
+ <version>1.2</version>
+ </dependency>
+```
+
+Download [dexmaker-1.2.jar](http://search.maven.org/remotecontent?filepath=com/google/dexmaker/dexmaker/1.2/dexmaker-1.2.jar)
+and [dexmaker-mockito-1.2.jar](http://search.maven.org/remotecontent?filepath=com/google/dexmaker/dexmaker-mockito/1.2/dexmaker-mockito-1.2.jar).
+
+Run the Unit Tests
+------------------
+
+The unit tests for dexmaker must be run on a dalvikvm. In order to do this, you can use [Vogar](https://code.google.com/p/vogar/) in the following fashion:
+
+```
+$ java -jar vogar.jar --mode device --sourcepath /path/to/dexmaker/dexmaker/src/test/java --sourcepath /path/to/dexmaker/dexmaker/src/main/java --sourcepath /path/to/dexmaker/dx/src/main/java --device-dir /data/dexmaker /path/to/dexmaker/dexmaker/src/test/
+```
+
+Download [vogar.jar](https://vogar.googlecode.com/files/vogar.jar).
diff --git a/bug-10862083.patch b/bug-10862083.patch
deleted file mode 100644
index 0dec4c3..0000000
--- a/bug-10862083.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
-index 268f2fd..2775a63 100644
---- a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
-+++ b/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
-@@ -45,11 +45,6 @@ final class InvocationHandlerAdapter implements InvocationHandler {
- return System.identityHashCode(proxy);
- }
-
-- if (args == null) {
-- throw new IllegalArgumentException();
-- }
--
--
- ProxiedMethod proxiedMethod = new ProxiedMethod(method);
- return handler.handle(new InvocationImpl(proxy, proxiedMethod, args, SequenceNumber.next(),
- proxiedMethod));
diff --git a/bug-8108255.patch b/bug-8108255.patch
index 6e1566d..bdccc8e 100644
--- a/bug-8108255.patch
+++ b/bug-8108255.patch
@@ -1,6 +1,6 @@
-diff -ur src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java patched_src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
---- src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-01-07 11:27:13.000000000 -0800
-+++ patched_src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-02-15 11:27:44.000000000 -0800
+diff -ur a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
+--- a/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-01-07 11:27:13.000000000 -0800
++++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java 2013-02-15 11:27:44.000000000 -0800
@@ -45,9 +45,10 @@
Class[] classesToMock = new Class[extraInterfaces.length + 1];
classesToMock[0] = typeToMock;
diff --git a/dexmaker/pom.xml b/dexmaker/pom.xml
new file mode 100644
index 0000000..9e6b526
--- /dev/null
+++ b/dexmaker/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.crittercism.dexmaker</groupId>
+ <artifactId>dexmaker-parent</artifactId>
+ <version>1.3</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dexmaker</artifactId>
+ <name>dexmaker</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.crittercism.dexmaker</groupId>
+ <artifactId>dexmaker-dx</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jarjar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>com.google.dexmaker:dexmaker-dx</include>
+ </includes>
+ <rules>
+ <rule>
+ <pattern>com.android.dx.**</pattern>
+ <result>com.google.dexmaker.dx.@1</result>
+ </rule>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/main/java/com/google/dexmaker/AppDataDirGuesser.java b/dexmaker/src/main/java/com/google/dexmaker/AppDataDirGuesser.java
index 4479887..4479887 100644
--- a/src/main/java/com/google/dexmaker/AppDataDirGuesser.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/AppDataDirGuesser.java
diff --git a/src/main/java/com/google/dexmaker/BinaryOp.java b/dexmaker/src/main/java/com/google/dexmaker/BinaryOp.java
index 04734cf..04734cf 100644
--- a/src/main/java/com/google/dexmaker/BinaryOp.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/BinaryOp.java
diff --git a/src/main/java/com/google/dexmaker/Code.java b/dexmaker/src/main/java/com/google/dexmaker/Code.java
index 54409a5..54409a5 100644
--- a/src/main/java/com/google/dexmaker/Code.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Code.java
diff --git a/src/main/java/com/google/dexmaker/Comparison.java b/dexmaker/src/main/java/com/google/dexmaker/Comparison.java
index 06e3ca3..06e3ca3 100644
--- a/src/main/java/com/google/dexmaker/Comparison.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Comparison.java
diff --git a/src/main/java/com/google/dexmaker/Constants.java b/dexmaker/src/main/java/com/google/dexmaker/Constants.java
index ec21cb8..ec21cb8 100644
--- a/src/main/java/com/google/dexmaker/Constants.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Constants.java
diff --git a/src/main/java/com/google/dexmaker/DexMaker.java b/dexmaker/src/main/java/com/google/dexmaker/DexMaker.java
index 4e67433..4e67433 100644
--- a/src/main/java/com/google/dexmaker/DexMaker.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/DexMaker.java
diff --git a/src/main/java/com/google/dexmaker/FieldId.java b/dexmaker/src/main/java/com/google/dexmaker/FieldId.java
index c03e1d1..c03e1d1 100644
--- a/src/main/java/com/google/dexmaker/FieldId.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/FieldId.java
diff --git a/src/main/java/com/google/dexmaker/Label.java b/dexmaker/src/main/java/com/google/dexmaker/Label.java
index b37b18c..b37b18c 100644
--- a/src/main/java/com/google/dexmaker/Label.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Label.java
diff --git a/src/main/java/com/google/dexmaker/Local.java b/dexmaker/src/main/java/com/google/dexmaker/Local.java
index c89436d..c89436d 100644
--- a/src/main/java/com/google/dexmaker/Local.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/Local.java
diff --git a/src/main/java/com/google/dexmaker/MethodId.java b/dexmaker/src/main/java/com/google/dexmaker/MethodId.java
index a43060c..a43060c 100644
--- a/src/main/java/com/google/dexmaker/MethodId.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/MethodId.java
diff --git a/src/main/java/com/google/dexmaker/TypeId.java b/dexmaker/src/main/java/com/google/dexmaker/TypeId.java
index 36e0b5a..36e0b5a 100644
--- a/src/main/java/com/google/dexmaker/TypeId.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/TypeId.java
diff --git a/src/main/java/com/google/dexmaker/TypeList.java b/dexmaker/src/main/java/com/google/dexmaker/TypeList.java
index 688157f..688157f 100644
--- a/src/main/java/com/google/dexmaker/TypeList.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/TypeList.java
diff --git a/src/main/java/com/google/dexmaker/UnaryOp.java b/dexmaker/src/main/java/com/google/dexmaker/UnaryOp.java
index cf565bb..cf565bb 100644
--- a/src/main/java/com/google/dexmaker/UnaryOp.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/UnaryOp.java
diff --git a/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java b/dexmaker/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java
index aa59886..9b2545a 100644
--- a/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java
+++ b/dexmaker/src/main/java/com/google/dexmaker/stock/ProxyBuilder.java
@@ -229,12 +229,18 @@ public final class ProxyBuilder<T> {
// Thrown when the base class constructor throws an exception.
throw launderCause(e);
}
- setHandlerInstanceField(result, handler);
+ setInvocationHandler(result, handler);
return result;
}
// TODO: test coverage for this
- // TODO: documentation for this
+
+ /**
+ * Generate a proxy class. Note that new instances of this class will not automatically have an
+ * an invocation handler, even if {@link #handler(InvocationHandler)} was called. The handler
+ * must be set on each instance after it is created, using
+ * {@link #setInvocationHandler(Object, InvocationHandler)}.
+ */
public Class<? extends T> buildProxyClass() throws IOException {
// try the cache to see if we've generated this one before
@SuppressWarnings("unchecked") // we only populate the map with matching types
@@ -292,20 +298,6 @@ public final class ProxyBuilder<T> {
throw new UndeclaredThrowableException(cause);
}
- private static void setHandlerInstanceField(Object instance, InvocationHandler handler) {
- try {
- Field handlerField = instance.getClass().getDeclaredField(FIELD_NAME_HANDLER);
- handlerField.setAccessible(true);
- handlerField.set(instance, handler);
- } catch (NoSuchFieldException e) {
- // Should not be thrown, generated proxy class has been generated with this field.
- throw new AssertionError(e);
- } catch (IllegalAccessException e) {
- // Should not be thrown, we just set the field to accessible.
- throw new AssertionError(e);
- }
- }
-
private static void setMethodsStaticField(Class<?> proxyClass, Method[] methodsToProxy) {
try {
Field methodArrayField = proxyClass.getDeclaredField(FIELD_NAME_METHODS);
@@ -338,6 +330,31 @@ public final class ProxyBuilder<T> {
}
}
+ /**
+ * Sets the proxy's {@link InvocationHandler}.
+ * <p>
+ * If you create a proxy with {@link #build()}, the proxy will already have a handler set,
+ * provided that you configured one with {@link #handler(InvocationHandler)}.
+ * <p>
+ * If you generate a proxy class with {@link #buildProxyClass()}, instances of the proxy class
+ * will not automatically have a handler set, and it is necessary to use this method with each
+ * instance.
+ *
+ * @throws IllegalArgumentException if the object supplied is not a proxy created by this class.
+ */
+ public static void setInvocationHandler(Object instance, InvocationHandler handler) {
+ try {
+ Field handlerField = instance.getClass().getDeclaredField(FIELD_NAME_HANDLER);
+ handlerField.setAccessible(true);
+ handlerField.set(instance, handler);
+ } catch (NoSuchFieldException e) {
+ throw new IllegalArgumentException("Not a valid proxy instance", e);
+ } catch (IllegalAccessException e) {
+ // Should not be thrown, we just set the field to accessible.
+ throw new AssertionError(e);
+ }
+ }
+
// TODO: test coverage for isProxyClass
/**
@@ -605,6 +622,11 @@ public final class ProxyBuilder<T> {
for (Class<?> c = baseClass; c != null; c = c.getSuperclass()) {
getMethodsToProxy(methodsToProxy, seenFinalMethods, c);
}
+ for (Class<?> c = baseClass; c != null; c = c.getSuperclass()) {
+ for (Class<?> i : c.getInterfaces()) {
+ getMethodsToProxy(methodsToProxy, seenFinalMethods, i);
+ }
+ }
for (Class<?> c : interfaces) {
getMethodsToProxy(methodsToProxy, seenFinalMethods, c);
}
@@ -645,6 +667,20 @@ public final class ProxyBuilder<T> {
// Skip static methods, overriding them has no effect.
continue;
}
+ if (!Modifier.isPublic(method.getModifiers())
+ && !Modifier.isProtected(method.getModifiers())) {
+ // Skip private methods, since they are invoked through direct
+ // invocation (as opposed to virtual). Therefore, it would not
+ // be possible to intercept any private method defined inside
+ // the proxy class except through reflection.
+
+ // Skip package-private methods as well. The proxy class does
+ // not actually inherit package-private methods from the parent
+ // class because it is not a member of the parent's package.
+ // This is even true if the two classes have the same package
+ // name, as they use different class loaders.
+ continue;
+ }
if (method.getName().equals("finalize") && method.getParameterTypes().length == 0) {
// Skip finalize method, it's likely important that it execute as normal.
continue;
@@ -657,10 +693,6 @@ public final class ProxyBuilder<T> {
}
sink.add(entry);
}
-
- for (Class<?> i : c.getInterfaces()) {
- getMethodsToProxy(sink, seenFinalMethods, i);
- }
}
private static <T> String getMethodNameForProxyOf(Class<T> clazz) {
diff --git a/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java b/dexmaker/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java
index b638509..b638509 100644
--- a/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/AppDataDirGuesserTest.java
diff --git a/src/test/java/com/google/dexmaker/DexMakerTest.java b/dexmaker/src/test/java/com/google/dexmaker/DexMakerTest.java
index 2b7a27b..2b7a27b 100644
--- a/src/test/java/com/google/dexmaker/DexMakerTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/DexMakerTest.java
diff --git a/src/test/java/com/google/dexmaker/TypeIdTest.java b/dexmaker/src/test/java/com/google/dexmaker/TypeIdTest.java
index 26e8413..26e8413 100644
--- a/src/test/java/com/google/dexmaker/TypeIdTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/TypeIdTest.java
diff --git a/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java b/dexmaker/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
index ced3d53..ced3d53 100644
--- a/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/examples/FibonacciMaker.java
diff --git a/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java b/dexmaker/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java
index 40dd1aa..40dd1aa 100644
--- a/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/examples/HelloWorldMaker.java
diff --git a/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java b/dexmaker/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java
index 763d740..5c499c8 100644
--- a/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java
+++ b/dexmaker/src/test/java/com/google/dexmaker/stock/ProxyBuilderTest.java
@@ -161,7 +161,15 @@ public class ProxyBuilderTest extends TestCase {
}
public void testProxyingPrivateMethods_NotIntercepted() throws Throwable {
- assertEquals("expected", proxyFor(HasPrivateMethod.class).build().result());
+ HasPrivateMethod proxy = proxyFor(HasPrivateMethod.class).build();
+ try {
+ proxy.getClass().getDeclaredMethod("result");
+ fail();
+ } catch (NoSuchMethodException expected) {
+
+ }
+
+ assertEquals("expected", proxy.result());
}
public static class HasPackagePrivateMethod {
@@ -170,8 +178,23 @@ public class ProxyBuilderTest extends TestCase {
}
}
- public void testProxyingPackagePrivateMethods_AreIntercepted() throws Throwable {
- assertEquals("fake result", proxyFor(HasPackagePrivateMethod.class).build().result());
+ public void testProxyingPackagePrivateMethods_NotIntercepted()
+ throws Throwable {
+ HasPackagePrivateMethod proxy = proxyFor(HasPackagePrivateMethod.class)
+ .build();
+ try {
+ proxy.getClass().getDeclaredMethod("result");
+ fail();
+ } catch (NoSuchMethodException expected) {
+
+ }
+
+ try {
+ proxy.result();
+ fail();
+ } catch (AssertionFailedError expected) {
+
+ }
}
public static class HasProtectedMethod {
@@ -184,6 +207,32 @@ public class ProxyBuilderTest extends TestCase {
assertEquals("fake result", proxyFor(HasProtectedMethod.class).build().result());
}
+ public static class MyParentClass {
+ String someMethod() {
+ return "package";
+ }
+ }
+
+ public static class MyChildClassWithProtectedMethod extends MyParentClass {
+ @Override
+ protected String someMethod() {
+ return "protected";
+ }
+ }
+
+ public static class MyChildClassWithPublicMethod extends MyParentClass {
+ @Override
+ public String someMethod() {
+ return "public";
+ }
+ }
+
+ public void testProxying_ClassHierarchy() throws Throwable {
+ assertEquals("package", proxyFor(MyParentClass.class).build().someMethod());
+ assertEquals("fake result", proxyFor(MyChildClassWithProtectedMethod.class).build().someMethod());
+ assertEquals("fake result", proxyFor(MyChildClassWithPublicMethod.class).build().someMethod());
+ }
+
public static class HasVoidMethod {
public void dangerousMethod() {
fail();
@@ -833,6 +882,22 @@ public class ProxyBuilderTest extends TestCase {
assertEquals("no proxy", proxyFor(ExtenstionOfFinalInterfaceImpl.class).build().foo());
}
+ // https://code.google.com/p/dexmaker/issues/detail?id=9
+ public interface DeclaresMethodLate {
+ void thisIsTheMethod();
+ }
+
+ public static class MakesMethodFinalEarly {
+ public final void thisIsTheMethod() {}
+ }
+
+ public static class YouDoNotChooseYourFamily
+ extends MakesMethodFinalEarly implements DeclaresMethodLate {}
+
+ public void testInterfaceMethodMadeFinalBeforeActualInheritance() throws Exception {
+ proxyFor(YouDoNotChooseYourFamily.class).build();
+ }
+
/** Simple helper to add the most common args for this test to the proxy builder. */
private <T> ProxyBuilder<T> proxyFor(Class<T> clazz) throws Exception {
return ProxyBuilder.forClass(clazz)
diff --git a/dx/pom.xml b/dx/pom.xml
new file mode 100644
index 0000000..d9977d1
--- /dev/null
+++ b/dx/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.crittercism.dexmaker</groupId>
+ <artifactId>dexmaker-parent</artifactId>
+ <version>1.3</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dexmaker-dx</artifactId>
+ <packaging>jar</packaging>
+ <name>dexmaker dx</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/dx/java/com/android/dx/Version.java b/dx/src/main/java/com/android/dx/Version.java
index 130025a..130025a 100644
--- a/src/dx/java/com/android/dx/Version.java
+++ b/dx/src/main/java/com/android/dx/Version.java
diff --git a/src/dx/java/com/android/dx/cf/code/Merger.java b/dx/src/main/java/com/android/dx/cf/code/Merger.java
index cce3f25..cce3f25 100644
--- a/src/dx/java/com/android/dx/cf/code/Merger.java
+++ b/dx/src/main/java/com/android/dx/cf/code/Merger.java
diff --git a/src/dx/java/com/android/dx/dex/DexFormat.java b/dx/src/main/java/com/android/dx/dex/DexFormat.java
index 3543b35..3543b35 100644
--- a/src/dx/java/com/android/dx/dex/DexFormat.java
+++ b/dx/src/main/java/com/android/dx/dex/DexFormat.java
diff --git a/src/dx/java/com/android/dx/dex/DexOptions.java b/dx/src/main/java/com/android/dx/dex/DexOptions.java
index 0357384..0357384 100644
--- a/src/dx/java/com/android/dx/dex/DexOptions.java
+++ b/dx/src/main/java/com/android/dx/dex/DexOptions.java
diff --git a/src/dx/java/com/android/dx/dex/SizeOf.java b/dx/src/main/java/com/android/dx/dex/SizeOf.java
index 476f7bb..476f7bb 100644
--- a/src/dx/java/com/android/dx/dex/SizeOf.java
+++ b/dx/src/main/java/com/android/dx/dex/SizeOf.java
diff --git a/src/dx/java/com/android/dx/dex/code/ArrayData.java b/dx/src/main/java/com/android/dx/dex/code/ArrayData.java
index 6674b75..6674b75 100644
--- a/src/dx/java/com/android/dx/dex/code/ArrayData.java
+++ b/dx/src/main/java/com/android/dx/dex/code/ArrayData.java
diff --git a/src/dx/java/com/android/dx/dex/code/BlockAddresses.java b/dx/src/main/java/com/android/dx/dex/code/BlockAddresses.java
index 1a1d184..1a1d184 100644
--- a/src/dx/java/com/android/dx/dex/code/BlockAddresses.java
+++ b/dx/src/main/java/com/android/dx/dex/code/BlockAddresses.java
diff --git a/src/dx/java/com/android/dx/dex/code/CatchBuilder.java b/dx/src/main/java/com/android/dx/dex/code/CatchBuilder.java
index 90d2e8d..90d2e8d 100644
--- a/src/dx/java/com/android/dx/dex/code/CatchBuilder.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CatchBuilder.java
diff --git a/src/dx/java/com/android/dx/dex/code/CatchHandlerList.java b/dx/src/main/java/com/android/dx/dex/code/CatchHandlerList.java
index 8472584..8472584 100644
--- a/src/dx/java/com/android/dx/dex/code/CatchHandlerList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CatchHandlerList.java
diff --git a/src/dx/java/com/android/dx/dex/code/CatchTable.java b/dx/src/main/java/com/android/dx/dex/code/CatchTable.java
index 0ee890f..0ee890f 100644
--- a/src/dx/java/com/android/dx/dex/code/CatchTable.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CatchTable.java
diff --git a/src/dx/java/com/android/dx/dex/code/CodeAddress.java b/dx/src/main/java/com/android/dx/dex/code/CodeAddress.java
index 5d26bd1..5d26bd1 100644
--- a/src/dx/java/com/android/dx/dex/code/CodeAddress.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CodeAddress.java
diff --git a/src/dx/java/com/android/dx/dex/code/CstInsn.java b/dx/src/main/java/com/android/dx/dex/code/CstInsn.java
index 3f848c0..3f848c0 100644
--- a/src/dx/java/com/android/dx/dex/code/CstInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/CstInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/DalvCode.java b/dx/src/main/java/com/android/dx/dex/code/DalvCode.java
index 58f191b..58f191b 100644
--- a/src/dx/java/com/android/dx/dex/code/DalvCode.java
+++ b/dx/src/main/java/com/android/dx/dex/code/DalvCode.java
diff --git a/src/dx/java/com/android/dx/dex/code/DalvInsn.java b/dx/src/main/java/com/android/dx/dex/code/DalvInsn.java
index d0cf395..d0cf395 100644
--- a/src/dx/java/com/android/dx/dex/code/DalvInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/DalvInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/DalvInsnList.java b/dx/src/main/java/com/android/dx/dex/code/DalvInsnList.java
index e856cb4..e856cb4 100644
--- a/src/dx/java/com/android/dx/dex/code/DalvInsnList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/DalvInsnList.java
diff --git a/src/dx/java/com/android/dx/dex/code/Dop.java b/dx/src/main/java/com/android/dx/dex/code/Dop.java
index 51d1b51..51d1b51 100644
--- a/src/dx/java/com/android/dx/dex/code/Dop.java
+++ b/dx/src/main/java/com/android/dx/dex/code/Dop.java
diff --git a/src/dx/java/com/android/dx/dex/code/Dops.java b/dx/src/main/java/com/android/dx/dex/code/Dops.java
index c066252..c066252 100644
--- a/src/dx/java/com/android/dx/dex/code/Dops.java
+++ b/dx/src/main/java/com/android/dx/dex/code/Dops.java
diff --git a/src/dx/java/com/android/dx/dex/code/FixedSizeInsn.java b/dx/src/main/java/com/android/dx/dex/code/FixedSizeInsn.java
index faed530..faed530 100644
--- a/src/dx/java/com/android/dx/dex/code/FixedSizeInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/FixedSizeInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/HighRegisterPrefix.java b/dx/src/main/java/com/android/dx/dex/code/HighRegisterPrefix.java
index 6fab094..6fab094 100644
--- a/src/dx/java/com/android/dx/dex/code/HighRegisterPrefix.java
+++ b/dx/src/main/java/com/android/dx/dex/code/HighRegisterPrefix.java
diff --git a/src/dx/java/com/android/dx/dex/code/InsnFormat.java b/dx/src/main/java/com/android/dx/dex/code/InsnFormat.java
index bf9f08e..bf9f08e 100644
--- a/src/dx/java/com/android/dx/dex/code/InsnFormat.java
+++ b/dx/src/main/java/com/android/dx/dex/code/InsnFormat.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalEnd.java b/dx/src/main/java/com/android/dx/dex/code/LocalEnd.java
index 1c2bf89..1c2bf89 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalEnd.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalEnd.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalList.java b/dx/src/main/java/com/android/dx/dex/code/LocalList.java
index ab8343a..ab8343a 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalList.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalSnapshot.java b/dx/src/main/java/com/android/dx/dex/code/LocalSnapshot.java
index baeab4c..baeab4c 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalSnapshot.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalSnapshot.java
diff --git a/src/dx/java/com/android/dx/dex/code/LocalStart.java b/dx/src/main/java/com/android/dx/dex/code/LocalStart.java
index 9a17c5b..9a17c5b 100644
--- a/src/dx/java/com/android/dx/dex/code/LocalStart.java
+++ b/dx/src/main/java/com/android/dx/dex/code/LocalStart.java
diff --git a/src/dx/java/com/android/dx/dex/code/OddSpacer.java b/dx/src/main/java/com/android/dx/dex/code/OddSpacer.java
index f44f9cc..f44f9cc 100644
--- a/src/dx/java/com/android/dx/dex/code/OddSpacer.java
+++ b/dx/src/main/java/com/android/dx/dex/code/OddSpacer.java
diff --git a/src/dx/java/com/android/dx/dex/code/OutputCollector.java b/dx/src/main/java/com/android/dx/dex/code/OutputCollector.java
index a5e54a8..a5e54a8 100644
--- a/src/dx/java/com/android/dx/dex/code/OutputCollector.java
+++ b/dx/src/main/java/com/android/dx/dex/code/OutputCollector.java
diff --git a/src/dx/java/com/android/dx/dex/code/OutputFinisher.java b/dx/src/main/java/com/android/dx/dex/code/OutputFinisher.java
index 19b5634..19b5634 100644
--- a/src/dx/java/com/android/dx/dex/code/OutputFinisher.java
+++ b/dx/src/main/java/com/android/dx/dex/code/OutputFinisher.java
diff --git a/src/dx/java/com/android/dx/dex/code/PositionList.java b/dx/src/main/java/com/android/dx/dex/code/PositionList.java
index 1e07e46..1e07e46 100644
--- a/src/dx/java/com/android/dx/dex/code/PositionList.java
+++ b/dx/src/main/java/com/android/dx/dex/code/PositionList.java
diff --git a/src/dx/java/com/android/dx/dex/code/RopToDop.java b/dx/src/main/java/com/android/dx/dex/code/RopToDop.java
index 0330113..0330113 100644
--- a/src/dx/java/com/android/dx/dex/code/RopToDop.java
+++ b/dx/src/main/java/com/android/dx/dex/code/RopToDop.java
diff --git a/src/dx/java/com/android/dx/dex/code/RopTranslator.java b/dx/src/main/java/com/android/dx/dex/code/RopTranslator.java
index 3d24c4f..3d24c4f 100644
--- a/src/dx/java/com/android/dx/dex/code/RopTranslator.java
+++ b/dx/src/main/java/com/android/dx/dex/code/RopTranslator.java
diff --git a/src/dx/java/com/android/dx/dex/code/SimpleInsn.java b/dx/src/main/java/com/android/dx/dex/code/SimpleInsn.java
index 8cdcc55..8cdcc55 100644
--- a/src/dx/java/com/android/dx/dex/code/SimpleInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/SimpleInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/StdCatchBuilder.java b/dx/src/main/java/com/android/dx/dex/code/StdCatchBuilder.java
index 1e7612e..1e7612e 100644
--- a/src/dx/java/com/android/dx/dex/code/StdCatchBuilder.java
+++ b/dx/src/main/java/com/android/dx/dex/code/StdCatchBuilder.java
diff --git a/src/dx/java/com/android/dx/dex/code/SwitchData.java b/dx/src/main/java/com/android/dx/dex/code/SwitchData.java
index 8fc80b1..8fc80b1 100644
--- a/src/dx/java/com/android/dx/dex/code/SwitchData.java
+++ b/dx/src/main/java/com/android/dx/dex/code/SwitchData.java
diff --git a/src/dx/java/com/android/dx/dex/code/TargetInsn.java b/dx/src/main/java/com/android/dx/dex/code/TargetInsn.java
index cbb5ff9..cbb5ff9 100644
--- a/src/dx/java/com/android/dx/dex/code/TargetInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/TargetInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/VariableSizeInsn.java b/dx/src/main/java/com/android/dx/dex/code/VariableSizeInsn.java
index 06b40f7..06b40f7 100644
--- a/src/dx/java/com/android/dx/dex/code/VariableSizeInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/VariableSizeInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/ZeroSizeInsn.java b/dx/src/main/java/com/android/dx/dex/code/ZeroSizeInsn.java
index 2cc157b..2cc157b 100644
--- a/src/dx/java/com/android/dx/dex/code/ZeroSizeInsn.java
+++ b/dx/src/main/java/com/android/dx/dex/code/ZeroSizeInsn.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form10t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form10t.java
index ced4a64..ced4a64 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form10t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form10t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form10x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form10x.java
index 4be3aa0..4be3aa0 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form10x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form10x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form11n.java b/dx/src/main/java/com/android/dx/dex/code/form/Form11n.java
index 479af6e..479af6e 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form11n.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form11n.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form11x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form11x.java
index 82dda65..82dda65 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form11x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form11x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form12x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form12x.java
index aabab8a..aabab8a 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form12x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form12x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form20t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form20t.java
index a19ed28..a19ed28 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form20t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form20t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21c.java
index 0335dc7..0335dc7 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21h.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21h.java
index 02cc0fd..02cc0fd 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21h.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21h.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21s.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21s.java
index 9264ec0..9264ec0 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21s.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21s.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form21t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form21t.java
index 8adb668..8adb668 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form21t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form21t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22b.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22b.java
index e5a8b5d..e5a8b5d 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22b.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22b.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22c.java
index 5ffdb86..5ffdb86 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22s.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22s.java
index 03d180a..03d180a 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22s.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22s.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22t.java
index 15ce0f8..15ce0f8 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form22x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form22x.java
index 01eec0b..01eec0b 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form22x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form22x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form23x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form23x.java
index 9164482..9164482 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form23x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form23x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form30t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form30t.java
index 86a3e82..86a3e82 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form30t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form30t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form31c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form31c.java
index 3295fda..3295fda 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form31c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form31c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form31i.java b/dx/src/main/java/com/android/dx/dex/code/form/Form31i.java
index b52341d..b52341d 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form31i.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form31i.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form31t.java b/dx/src/main/java/com/android/dx/dex/code/form/Form31t.java
index 1999bba..1999bba 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form31t.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form31t.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form32s.java b/dx/src/main/java/com/android/dx/dex/code/form/Form32s.java
index e081470..e081470 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form32s.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form32s.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form32x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form32x.java
index abed0e9..abed0e9 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form32x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form32x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form33x.java b/dx/src/main/java/com/android/dx/dex/code/form/Form33x.java
index 9a569a0..9a569a0 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form33x.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form33x.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form35c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form35c.java
index b9c12c6..b9c12c6 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form35c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form35c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form3rc.java b/dx/src/main/java/com/android/dx/dex/code/form/Form3rc.java
index 1727af5..1727af5 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form3rc.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form3rc.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form41c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form41c.java
index 24067bc..24067bc 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form41c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form41c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form51l.java b/dx/src/main/java/com/android/dx/dex/code/form/Form51l.java
index 4dc7bcd..4dc7bcd 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form51l.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form51l.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form52c.java b/dx/src/main/java/com/android/dx/dex/code/form/Form52c.java
index acd2124..acd2124 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form52c.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form52c.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/Form5rc.java b/dx/src/main/java/com/android/dx/dex/code/form/Form5rc.java
index 0c54702..0c54702 100644
--- a/src/dx/java/com/android/dx/dex/code/form/Form5rc.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/Form5rc.java
diff --git a/src/dx/java/com/android/dx/dex/code/form/SpecialFormat.java b/dx/src/main/java/com/android/dx/dex/code/form/SpecialFormat.java
index 87091b5..87091b5 100644
--- a/src/dx/java/com/android/dx/dex/code/form/SpecialFormat.java
+++ b/dx/src/main/java/com/android/dx/dex/code/form/SpecialFormat.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationItem.java
index 1d92247..1d92247 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationSetItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetItem.java
index 2187700..2187700 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationSetItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationSetRefItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetRefItem.java
index 53072d8..53072d8 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationSetRefItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationSetRefItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationUtils.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationUtils.java
index 350ed9a..350ed9a 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationUtils.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationUtils.java
diff --git a/src/dx/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java b/dx/src/main/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java
index 972d4e6..972d4e6 100644
--- a/src/dx/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/AnnotationsDirectoryItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/CatchStructs.java b/dx/src/main/java/com/android/dx/dex/file/CatchStructs.java
index 8b0f1bd..8b0f1bd 100644
--- a/src/dx/java/com/android/dx/dex/file/CatchStructs.java
+++ b/dx/src/main/java/com/android/dx/dex/file/CatchStructs.java
diff --git a/src/dx/java/com/android/dx/dex/file/ClassDataItem.java b/dx/src/main/java/com/android/dx/dex/file/ClassDataItem.java
index e9ae18b..e9ae18b 100644
--- a/src/dx/java/com/android/dx/dex/file/ClassDataItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ClassDataItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ClassDefItem.java b/dx/src/main/java/com/android/dx/dex/file/ClassDefItem.java
index df3945a..df3945a 100644
--- a/src/dx/java/com/android/dx/dex/file/ClassDefItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ClassDefItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ClassDefsSection.java b/dx/src/main/java/com/android/dx/dex/file/ClassDefsSection.java
index 1ca391f..1ca391f 100644
--- a/src/dx/java/com/android/dx/dex/file/ClassDefsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ClassDefsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/CodeItem.java b/dx/src/main/java/com/android/dx/dex/file/CodeItem.java
index a47f68a..a47f68a 100644
--- a/src/dx/java/com/android/dx/dex/file/CodeItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/CodeItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoConstants.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoConstants.java
index 78b6b04..78b6b04 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoConstants.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoConstants.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoDecoder.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoDecoder.java
index 9fb4845..9fb4845 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoDecoder.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoDecoder.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoEncoder.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoEncoder.java
index ae87fc3..ae87fc3 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoEncoder.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoEncoder.java
diff --git a/src/dx/java/com/android/dx/dex/file/DebugInfoItem.java b/dx/src/main/java/com/android/dx/dex/file/DebugInfoItem.java
index 09b2712..09b2712 100644
--- a/src/dx/java/com/android/dx/dex/file/DebugInfoItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DebugInfoItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/DexFile.java b/dx/src/main/java/com/android/dx/dex/file/DexFile.java
index 6a9882c..6a9882c 100644
--- a/src/dx/java/com/android/dx/dex/file/DexFile.java
+++ b/dx/src/main/java/com/android/dx/dex/file/DexFile.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedArrayItem.java b/dx/src/main/java/com/android/dx/dex/file/EncodedArrayItem.java
index 3d05ab3..3d05ab3 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedArrayItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedArrayItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedField.java b/dx/src/main/java/com/android/dx/dex/file/EncodedField.java
index fdfa5d2..fdfa5d2 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedField.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedField.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedMember.java b/dx/src/main/java/com/android/dx/dex/file/EncodedMember.java
index 6277646..6277646 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedMember.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedMember.java
diff --git a/src/dx/java/com/android/dx/dex/file/EncodedMethod.java b/dx/src/main/java/com/android/dx/dex/file/EncodedMethod.java
index c3f71b7..c3f71b7 100644
--- a/src/dx/java/com/android/dx/dex/file/EncodedMethod.java
+++ b/dx/src/main/java/com/android/dx/dex/file/EncodedMethod.java
diff --git a/src/dx/java/com/android/dx/dex/file/FieldAnnotationStruct.java b/dx/src/main/java/com/android/dx/dex/file/FieldAnnotationStruct.java
index f363d41..f363d41 100644
--- a/src/dx/java/com/android/dx/dex/file/FieldAnnotationStruct.java
+++ b/dx/src/main/java/com/android/dx/dex/file/FieldAnnotationStruct.java
diff --git a/src/dx/java/com/android/dx/dex/file/FieldIdItem.java b/dx/src/main/java/com/android/dx/dex/file/FieldIdItem.java
index ecb1d3d..ecb1d3d 100644
--- a/src/dx/java/com/android/dx/dex/file/FieldIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/FieldIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/FieldIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/FieldIdsSection.java
index c320731..c320731 100644
--- a/src/dx/java/com/android/dx/dex/file/FieldIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/FieldIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/HeaderItem.java b/dx/src/main/java/com/android/dx/dex/file/HeaderItem.java
index 3816eb8..3816eb8 100644
--- a/src/dx/java/com/android/dx/dex/file/HeaderItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/HeaderItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/HeaderSection.java b/dx/src/main/java/com/android/dx/dex/file/HeaderSection.java
index 21da488..21da488 100644
--- a/src/dx/java/com/android/dx/dex/file/HeaderSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/HeaderSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/IdItem.java b/dx/src/main/java/com/android/dx/dex/file/IdItem.java
index 1bd2b5f..1bd2b5f 100644
--- a/src/dx/java/com/android/dx/dex/file/IdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/IdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/IndexedItem.java b/dx/src/main/java/com/android/dx/dex/file/IndexedItem.java
index 9ba4783..9ba4783 100644
--- a/src/dx/java/com/android/dx/dex/file/IndexedItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/IndexedItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/Item.java b/dx/src/main/java/com/android/dx/dex/file/Item.java
index cf2b380..cf2b380 100644
--- a/src/dx/java/com/android/dx/dex/file/Item.java
+++ b/dx/src/main/java/com/android/dx/dex/file/Item.java
diff --git a/src/dx/java/com/android/dx/dex/file/ItemType.java b/dx/src/main/java/com/android/dx/dex/file/ItemType.java
index 2fe97ab..2fe97ab 100644
--- a/src/dx/java/com/android/dx/dex/file/ItemType.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ItemType.java
diff --git a/src/dx/java/com/android/dx/dex/file/MapItem.java b/dx/src/main/java/com/android/dx/dex/file/MapItem.java
index d78dc91..d78dc91 100644
--- a/src/dx/java/com/android/dx/dex/file/MapItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MapItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/MemberIdItem.java b/dx/src/main/java/com/android/dx/dex/file/MemberIdItem.java
index 08a3123..08a3123 100644
--- a/src/dx/java/com/android/dx/dex/file/MemberIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MemberIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/MemberIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/MemberIdsSection.java
index ec39b75..ec39b75 100644
--- a/src/dx/java/com/android/dx/dex/file/MemberIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MemberIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/MethodAnnotationStruct.java b/dx/src/main/java/com/android/dx/dex/file/MethodAnnotationStruct.java
index 38f7ce4..38f7ce4 100644
--- a/src/dx/java/com/android/dx/dex/file/MethodAnnotationStruct.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MethodAnnotationStruct.java
diff --git a/src/dx/java/com/android/dx/dex/file/MethodIdItem.java b/dx/src/main/java/com/android/dx/dex/file/MethodIdItem.java
index f2ff4f9..f2ff4f9 100644
--- a/src/dx/java/com/android/dx/dex/file/MethodIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MethodIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/MethodIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/MethodIdsSection.java
index fa0cd3c..fa0cd3c 100644
--- a/src/dx/java/com/android/dx/dex/file/MethodIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MethodIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/MixedItemSection.java b/dx/src/main/java/com/android/dx/dex/file/MixedItemSection.java
index b885306..b885306 100644
--- a/src/dx/java/com/android/dx/dex/file/MixedItemSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/MixedItemSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/OffsettedItem.java b/dx/src/main/java/com/android/dx/dex/file/OffsettedItem.java
index 7721470..7721470 100644
--- a/src/dx/java/com/android/dx/dex/file/OffsettedItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/OffsettedItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ParameterAnnotationStruct.java b/dx/src/main/java/com/android/dx/dex/file/ParameterAnnotationStruct.java
index 078c219..078c219 100644
--- a/src/dx/java/com/android/dx/dex/file/ParameterAnnotationStruct.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ParameterAnnotationStruct.java
diff --git a/src/dx/java/com/android/dx/dex/file/ProtoIdItem.java b/dx/src/main/java/com/android/dx/dex/file/ProtoIdItem.java
index 235a8c8..235a8c8 100644
--- a/src/dx/java/com/android/dx/dex/file/ProtoIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ProtoIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ProtoIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/ProtoIdsSection.java
index dc6e8ad..dc6e8ad 100644
--- a/src/dx/java/com/android/dx/dex/file/ProtoIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ProtoIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/Section.java b/dx/src/main/java/com/android/dx/dex/file/Section.java
index 3f04216..3f04216 100644
--- a/src/dx/java/com/android/dx/dex/file/Section.java
+++ b/dx/src/main/java/com/android/dx/dex/file/Section.java
diff --git a/src/dx/java/com/android/dx/dex/file/Statistics.java b/dx/src/main/java/com/android/dx/dex/file/Statistics.java
index 62e1832..62e1832 100644
--- a/src/dx/java/com/android/dx/dex/file/Statistics.java
+++ b/dx/src/main/java/com/android/dx/dex/file/Statistics.java
diff --git a/src/dx/java/com/android/dx/dex/file/StringDataItem.java b/dx/src/main/java/com/android/dx/dex/file/StringDataItem.java
index e85a823..e85a823 100644
--- a/src/dx/java/com/android/dx/dex/file/StringDataItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/StringDataItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/StringIdItem.java b/dx/src/main/java/com/android/dx/dex/file/StringIdItem.java
index 533427d..533427d 100644
--- a/src/dx/java/com/android/dx/dex/file/StringIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/StringIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/StringIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/StringIdsSection.java
index 2f7c40b..2f7c40b 100644
--- a/src/dx/java/com/android/dx/dex/file/StringIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/StringIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/TypeIdItem.java b/dx/src/main/java/com/android/dx/dex/file/TypeIdItem.java
index 04be2a1..04be2a1 100644
--- a/src/dx/java/com/android/dx/dex/file/TypeIdItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/TypeIdItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/TypeIdsSection.java b/dx/src/main/java/com/android/dx/dex/file/TypeIdsSection.java
index bcc8250..bcc8250 100644
--- a/src/dx/java/com/android/dx/dex/file/TypeIdsSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/TypeIdsSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/TypeListItem.java b/dx/src/main/java/com/android/dx/dex/file/TypeListItem.java
index b815dd3..b815dd3 100644
--- a/src/dx/java/com/android/dx/dex/file/TypeListItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/TypeListItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/UniformItemSection.java b/dx/src/main/java/com/android/dx/dex/file/UniformItemSection.java
index d8c09ab..d8c09ab 100644
--- a/src/dx/java/com/android/dx/dex/file/UniformItemSection.java
+++ b/dx/src/main/java/com/android/dx/dex/file/UniformItemSection.java
diff --git a/src/dx/java/com/android/dx/dex/file/UniformListItem.java b/dx/src/main/java/com/android/dx/dex/file/UniformListItem.java
index 88919c7..88919c7 100644
--- a/src/dx/java/com/android/dx/dex/file/UniformListItem.java
+++ b/dx/src/main/java/com/android/dx/dex/file/UniformListItem.java
diff --git a/src/dx/java/com/android/dx/dex/file/ValueEncoder.java b/dx/src/main/java/com/android/dx/dex/file/ValueEncoder.java
index 9c433a3..9c433a3 100644
--- a/src/dx/java/com/android/dx/dex/file/ValueEncoder.java
+++ b/dx/src/main/java/com/android/dx/dex/file/ValueEncoder.java
diff --git a/src/dx/java/com/android/dx/io/Code.java b/dx/src/main/java/com/android/dx/io/Code.java
index ba95d1b..ba95d1b 100644
--- a/src/dx/java/com/android/dx/io/Code.java
+++ b/dx/src/main/java/com/android/dx/io/Code.java
diff --git a/src/dx/java/com/android/dx/io/CodeReader.java b/dx/src/main/java/com/android/dx/io/CodeReader.java
index cab1063..cab1063 100644
--- a/src/dx/java/com/android/dx/io/CodeReader.java
+++ b/dx/src/main/java/com/android/dx/io/CodeReader.java
diff --git a/src/dx/java/com/android/dx/io/IndexType.java b/dx/src/main/java/com/android/dx/io/IndexType.java
index bbddfa8..bbddfa8 100644
--- a/src/dx/java/com/android/dx/io/IndexType.java
+++ b/dx/src/main/java/com/android/dx/io/IndexType.java
diff --git a/src/dx/java/com/android/dx/io/OpcodeInfo.java b/dx/src/main/java/com/android/dx/io/OpcodeInfo.java
index c8fcf25..c8fcf25 100644
--- a/src/dx/java/com/android/dx/io/OpcodeInfo.java
+++ b/dx/src/main/java/com/android/dx/io/OpcodeInfo.java
diff --git a/src/dx/java/com/android/dx/io/Opcodes.java b/dx/src/main/java/com/android/dx/io/Opcodes.java
index 4a255f7..4a255f7 100644
--- a/src/dx/java/com/android/dx/io/Opcodes.java
+++ b/dx/src/main/java/com/android/dx/io/Opcodes.java
diff --git a/src/dx/java/com/android/dx/io/instructions/AddressMap.java b/dx/src/main/java/com/android/dx/io/instructions/AddressMap.java
index a8dbe0b..a8dbe0b 100644
--- a/src/dx/java/com/android/dx/io/instructions/AddressMap.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/AddressMap.java
diff --git a/src/dx/java/com/android/dx/io/instructions/BaseCodeCursor.java b/dx/src/main/java/com/android/dx/io/instructions/BaseCodeCursor.java
index 6915fa8..6915fa8 100644
--- a/src/dx/java/com/android/dx/io/instructions/BaseCodeCursor.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/BaseCodeCursor.java
diff --git a/src/dx/java/com/android/dx/io/instructions/CodeCursor.java b/dx/src/main/java/com/android/dx/io/instructions/CodeCursor.java
index 68eb9c9..68eb9c9 100644
--- a/src/dx/java/com/android/dx/io/instructions/CodeCursor.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/CodeCursor.java
diff --git a/src/dx/java/com/android/dx/io/instructions/CodeInput.java b/dx/src/main/java/com/android/dx/io/instructions/CodeInput.java
index 41a5ef7..41a5ef7 100644
--- a/src/dx/java/com/android/dx/io/instructions/CodeInput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/CodeInput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/CodeOutput.java b/dx/src/main/java/com/android/dx/io/instructions/CodeOutput.java
index 7d0077e..7d0077e 100644
--- a/src/dx/java/com/android/dx/io/instructions/CodeOutput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/CodeOutput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/DecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/DecodedInstruction.java
index 9d9e88e..9d9e88e 100644
--- a/src/dx/java/com/android/dx/io/instructions/DecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/DecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
index 64fc55b..64fc55b 100644
--- a/src/dx/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
index 6e14d34..6e14d34 100644
--- a/src/dx/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
index 29836d0..29836d0 100644
--- a/src/dx/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/InstructionCodec.java b/dx/src/main/java/com/android/dx/io/instructions/InstructionCodec.java
index b864b83..b864b83 100644
--- a/src/dx/java/com/android/dx/io/instructions/InstructionCodec.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/InstructionCodec.java
diff --git a/src/dx/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
index fd38e3b..fd38e3b 100644
--- a/src/dx/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
index c31d319..c31d319 100644
--- a/src/dx/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
index f294f63..f294f63 100644
--- a/src/dx/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeInput.java b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeInput.java
index 49ce473..49ce473 100644
--- a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeInput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeInput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java
index efa7ddd..efa7ddd 100644
--- a/src/dx/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ShortArrayCodeOutput.java
diff --git a/src/dx/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
index bfc47c9..bfc47c9 100644
--- a/src/dx/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
index a463677..a463677 100644
--- a/src/dx/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
index acb77ba..acb77ba 100644
--- a/src/dx/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java b/dx/src/main/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
index 172caa4..172caa4 100644
--- a/src/dx/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
+++ b/dx/src/main/java/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/Annotation.java b/dx/src/main/java/com/android/dx/rop/annotation/Annotation.java
index 8f9e976..8f9e976 100644
--- a/src/dx/java/com/android/dx/rop/annotation/Annotation.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/Annotation.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/AnnotationVisibility.java b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationVisibility.java
index c717b8c..c717b8c 100644
--- a/src/dx/java/com/android/dx/rop/annotation/AnnotationVisibility.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationVisibility.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/Annotations.java b/dx/src/main/java/com/android/dx/rop/annotation/Annotations.java
index 807d5d4..807d5d4 100644
--- a/src/dx/java/com/android/dx/rop/annotation/Annotations.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/Annotations.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/AnnotationsList.java b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationsList.java
index b97b385..b97b385 100644
--- a/src/dx/java/com/android/dx/rop/annotation/AnnotationsList.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/AnnotationsList.java
diff --git a/src/dx/java/com/android/dx/rop/annotation/NameValuePair.java b/dx/src/main/java/com/android/dx/rop/annotation/NameValuePair.java
index 56c4936..56c4936 100644
--- a/src/dx/java/com/android/dx/rop/annotation/NameValuePair.java
+++ b/dx/src/main/java/com/android/dx/rop/annotation/NameValuePair.java
diff --git a/src/dx/java/com/android/dx/rop/code/AccessFlags.java b/dx/src/main/java/com/android/dx/rop/code/AccessFlags.java
index 2d84fe8..2d84fe8 100644
--- a/src/dx/java/com/android/dx/rop/code/AccessFlags.java
+++ b/dx/src/main/java/com/android/dx/rop/code/AccessFlags.java
diff --git a/src/dx/java/com/android/dx/rop/code/BasicBlock.java b/dx/src/main/java/com/android/dx/rop/code/BasicBlock.java
index 9d99833..9d99833 100644
--- a/src/dx/java/com/android/dx/rop/code/BasicBlock.java
+++ b/dx/src/main/java/com/android/dx/rop/code/BasicBlock.java
diff --git a/src/dx/java/com/android/dx/rop/code/BasicBlockList.java b/dx/src/main/java/com/android/dx/rop/code/BasicBlockList.java
index ef79075..ef79075 100644
--- a/src/dx/java/com/android/dx/rop/code/BasicBlockList.java
+++ b/dx/src/main/java/com/android/dx/rop/code/BasicBlockList.java
diff --git a/src/dx/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java b/dx/src/main/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java
index 6c48acf..6c48acf 100644
--- a/src/dx/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java
+++ b/dx/src/main/java/com/android/dx/rop/code/ConservativeTranslationAdvice.java
diff --git a/src/dx/java/com/android/dx/rop/code/CstInsn.java b/dx/src/main/java/com/android/dx/rop/code/CstInsn.java
index d7de2f4..d7de2f4 100644
--- a/src/dx/java/com/android/dx/rop/code/CstInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/CstInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/DexTranslationAdvice.java b/dx/src/main/java/com/android/dx/rop/code/DexTranslationAdvice.java
index 35ce2f2..35ce2f2 100644
--- a/src/dx/java/com/android/dx/rop/code/DexTranslationAdvice.java
+++ b/dx/src/main/java/com/android/dx/rop/code/DexTranslationAdvice.java
diff --git a/src/dx/java/com/android/dx/rop/code/Exceptions.java b/dx/src/main/java/com/android/dx/rop/code/Exceptions.java
index 1e27a8c..1e27a8c 100644
--- a/src/dx/java/com/android/dx/rop/code/Exceptions.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Exceptions.java
diff --git a/src/dx/java/com/android/dx/rop/code/FillArrayDataInsn.java b/dx/src/main/java/com/android/dx/rop/code/FillArrayDataInsn.java
index ed9345d..ed9345d 100644
--- a/src/dx/java/com/android/dx/rop/code/FillArrayDataInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/FillArrayDataInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/Insn.java b/dx/src/main/java/com/android/dx/rop/code/Insn.java
index 5031f89..5031f89 100644
--- a/src/dx/java/com/android/dx/rop/code/Insn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Insn.java
diff --git a/src/dx/java/com/android/dx/rop/code/InsnList.java b/dx/src/main/java/com/android/dx/rop/code/InsnList.java
index 88abd72..88abd72 100644
--- a/src/dx/java/com/android/dx/rop/code/InsnList.java
+++ b/dx/src/main/java/com/android/dx/rop/code/InsnList.java
diff --git a/src/dx/java/com/android/dx/rop/code/LocalItem.java b/dx/src/main/java/com/android/dx/rop/code/LocalItem.java
index d238f21..d238f21 100644
--- a/src/dx/java/com/android/dx/rop/code/LocalItem.java
+++ b/dx/src/main/java/com/android/dx/rop/code/LocalItem.java
diff --git a/src/dx/java/com/android/dx/rop/code/LocalVariableExtractor.java b/dx/src/main/java/com/android/dx/rop/code/LocalVariableExtractor.java
index c2c4021..c2c4021 100644
--- a/src/dx/java/com/android/dx/rop/code/LocalVariableExtractor.java
+++ b/dx/src/main/java/com/android/dx/rop/code/LocalVariableExtractor.java
diff --git a/src/dx/java/com/android/dx/rop/code/LocalVariableInfo.java b/dx/src/main/java/com/android/dx/rop/code/LocalVariableInfo.java
index 5d2b995..5d2b995 100644
--- a/src/dx/java/com/android/dx/rop/code/LocalVariableInfo.java
+++ b/dx/src/main/java/com/android/dx/rop/code/LocalVariableInfo.java
diff --git a/src/dx/java/com/android/dx/rop/code/PlainCstInsn.java b/dx/src/main/java/com/android/dx/rop/code/PlainCstInsn.java
index fffa76b..fffa76b 100644
--- a/src/dx/java/com/android/dx/rop/code/PlainCstInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/PlainCstInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/PlainInsn.java b/dx/src/main/java/com/android/dx/rop/code/PlainInsn.java
index 3b52efa..3b52efa 100644
--- a/src/dx/java/com/android/dx/rop/code/PlainInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/PlainInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegOps.java b/dx/src/main/java/com/android/dx/rop/code/RegOps.java
index c81398d..c81398d 100644
--- a/src/dx/java/com/android/dx/rop/code/RegOps.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegOps.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegisterSpec.java b/dx/src/main/java/com/android/dx/rop/code/RegisterSpec.java
index e5f908b..e5f908b 100644
--- a/src/dx/java/com/android/dx/rop/code/RegisterSpec.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegisterSpec.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegisterSpecList.java b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecList.java
index 3d891fd..3d891fd 100644
--- a/src/dx/java/com/android/dx/rop/code/RegisterSpecList.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecList.java
diff --git a/src/dx/java/com/android/dx/rop/code/RegisterSpecSet.java b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecSet.java
index 14ef778..14ef778 100644
--- a/src/dx/java/com/android/dx/rop/code/RegisterSpecSet.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RegisterSpecSet.java
diff --git a/src/dx/java/com/android/dx/rop/code/Rop.java b/dx/src/main/java/com/android/dx/rop/code/Rop.java
index 8224584..8224584 100644
--- a/src/dx/java/com/android/dx/rop/code/Rop.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Rop.java
diff --git a/src/dx/java/com/android/dx/rop/code/RopMethod.java b/dx/src/main/java/com/android/dx/rop/code/RopMethod.java
index 591d325..591d325 100644
--- a/src/dx/java/com/android/dx/rop/code/RopMethod.java
+++ b/dx/src/main/java/com/android/dx/rop/code/RopMethod.java
diff --git a/src/dx/java/com/android/dx/rop/code/Rops.java b/dx/src/main/java/com/android/dx/rop/code/Rops.java
index c1f4f46..c1f4f46 100644
--- a/src/dx/java/com/android/dx/rop/code/Rops.java
+++ b/dx/src/main/java/com/android/dx/rop/code/Rops.java
diff --git a/src/dx/java/com/android/dx/rop/code/SourcePosition.java b/dx/src/main/java/com/android/dx/rop/code/SourcePosition.java
index 11ac992..11ac992 100644
--- a/src/dx/java/com/android/dx/rop/code/SourcePosition.java
+++ b/dx/src/main/java/com/android/dx/rop/code/SourcePosition.java
diff --git a/src/dx/java/com/android/dx/rop/code/SwitchInsn.java b/dx/src/main/java/com/android/dx/rop/code/SwitchInsn.java
index 31bb94d..31bb94d 100644
--- a/src/dx/java/com/android/dx/rop/code/SwitchInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/SwitchInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/ThrowingCstInsn.java b/dx/src/main/java/com/android/dx/rop/code/ThrowingCstInsn.java
index dee01b5..dee01b5 100644
--- a/src/dx/java/com/android/dx/rop/code/ThrowingCstInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/ThrowingCstInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/ThrowingInsn.java b/dx/src/main/java/com/android/dx/rop/code/ThrowingInsn.java
index 6561d41..6561d41 100644
--- a/src/dx/java/com/android/dx/rop/code/ThrowingInsn.java
+++ b/dx/src/main/java/com/android/dx/rop/code/ThrowingInsn.java
diff --git a/src/dx/java/com/android/dx/rop/code/TranslationAdvice.java b/dx/src/main/java/com/android/dx/rop/code/TranslationAdvice.java
index 832d84d..832d84d 100644
--- a/src/dx/java/com/android/dx/rop/code/TranslationAdvice.java
+++ b/dx/src/main/java/com/android/dx/rop/code/TranslationAdvice.java
diff --git a/src/dx/java/com/android/dx/rop/cst/Constant.java b/dx/src/main/java/com/android/dx/rop/cst/Constant.java
index 3ef035e..3ef035e 100644
--- a/src/dx/java/com/android/dx/rop/cst/Constant.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/Constant.java
diff --git a/src/dx/java/com/android/dx/rop/cst/ConstantPool.java b/dx/src/main/java/com/android/dx/rop/cst/ConstantPool.java
index efc394d..efc394d 100644
--- a/src/dx/java/com/android/dx/rop/cst/ConstantPool.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/ConstantPool.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstAnnotation.java b/dx/src/main/java/com/android/dx/rop/cst/CstAnnotation.java
index 8cdf1df..8cdf1df 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstAnnotation.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstAnnotation.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstArray.java b/dx/src/main/java/com/android/dx/rop/cst/CstArray.java
index 2766b5f..2766b5f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstArray.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstArray.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstBaseMethodRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstBaseMethodRef.java
index 5b0aeb6..5b0aeb6 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstBaseMethodRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstBaseMethodRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstBoolean.java b/dx/src/main/java/com/android/dx/rop/cst/CstBoolean.java
index 5ff858a..5ff858a 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstBoolean.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstBoolean.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstByte.java b/dx/src/main/java/com/android/dx/rop/cst/CstByte.java
index fc8f58f..fc8f58f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstByte.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstByte.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstChar.java b/dx/src/main/java/com/android/dx/rop/cst/CstChar.java
index 21d8b67..21d8b67 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstChar.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstChar.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstDouble.java b/dx/src/main/java/com/android/dx/rop/cst/CstDouble.java
index 8f1766f..8f1766f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstDouble.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstDouble.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstEnumRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstEnumRef.java
index 641ab3f..641ab3f 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstEnumRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstEnumRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstFieldRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstFieldRef.java
index a4d7180..a4d7180 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstFieldRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstFieldRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstFloat.java b/dx/src/main/java/com/android/dx/rop/cst/CstFloat.java
index 0a2354a..0a2354a 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstFloat.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstFloat.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstInteger.java b/dx/src/main/java/com/android/dx/rop/cst/CstInteger.java
index 3691fc0..3691fc0 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstInteger.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstInteger.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java
index 8b8cb30..8b8cb30 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstInterfaceMethodRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstKnownNull.java b/dx/src/main/java/com/android/dx/rop/cst/CstKnownNull.java
index a80322c..a80322c 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstKnownNull.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstKnownNull.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLiteral32.java b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral32.java
index 042cbd9..042cbd9 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLiteral32.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral32.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLiteral64.java b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral64.java
index 94cfa8c..94cfa8c 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLiteral64.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLiteral64.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLiteralBits.java b/dx/src/main/java/com/android/dx/rop/cst/CstLiteralBits.java
index 8bf13a2..8bf13a2 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLiteralBits.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLiteralBits.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstLong.java b/dx/src/main/java/com/android/dx/rop/cst/CstLong.java
index d159529..d159529 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstLong.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstLong.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstMemberRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstMemberRef.java
index 1775398..1775398 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstMemberRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstMemberRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstMethodRef.java b/dx/src/main/java/com/android/dx/rop/cst/CstMethodRef.java
index 075bc7c..075bc7c 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstMethodRef.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstMethodRef.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstNat.java b/dx/src/main/java/com/android/dx/rop/cst/CstNat.java
index cd067e9..cd067e9 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstNat.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstNat.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstShort.java b/dx/src/main/java/com/android/dx/rop/cst/CstShort.java
index 5be1022..5be1022 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstShort.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstShort.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstString.java b/dx/src/main/java/com/android/dx/rop/cst/CstString.java
index a778e97..a778e97 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstString.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstString.java
diff --git a/src/dx/java/com/android/dx/rop/cst/CstType.java b/dx/src/main/java/com/android/dx/rop/cst/CstType.java
index 8624028..8624028 100644
--- a/src/dx/java/com/android/dx/rop/cst/CstType.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/CstType.java
diff --git a/src/dx/java/com/android/dx/rop/cst/StdConstantPool.java b/dx/src/main/java/com/android/dx/rop/cst/StdConstantPool.java
index 244395d..244395d 100644
--- a/src/dx/java/com/android/dx/rop/cst/StdConstantPool.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/StdConstantPool.java
diff --git a/src/dx/java/com/android/dx/rop/cst/TypedConstant.java b/dx/src/main/java/com/android/dx/rop/cst/TypedConstant.java
index 1c738ee..1c738ee 100644
--- a/src/dx/java/com/android/dx/rop/cst/TypedConstant.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/TypedConstant.java
diff --git a/src/dx/java/com/android/dx/rop/cst/Zeroes.java b/dx/src/main/java/com/android/dx/rop/cst/Zeroes.java
index 7250b5a..7250b5a 100644
--- a/src/dx/java/com/android/dx/rop/cst/Zeroes.java
+++ b/dx/src/main/java/com/android/dx/rop/cst/Zeroes.java
diff --git a/src/dx/java/com/android/dx/rop/type/Prototype.java b/dx/src/main/java/com/android/dx/rop/type/Prototype.java
index 3fc5d82..3fc5d82 100644
--- a/src/dx/java/com/android/dx/rop/type/Prototype.java
+++ b/dx/src/main/java/com/android/dx/rop/type/Prototype.java
diff --git a/src/dx/java/com/android/dx/rop/type/StdTypeList.java b/dx/src/main/java/com/android/dx/rop/type/StdTypeList.java
index fe6647c..fe6647c 100644
--- a/src/dx/java/com/android/dx/rop/type/StdTypeList.java
+++ b/dx/src/main/java/com/android/dx/rop/type/StdTypeList.java
diff --git a/src/dx/java/com/android/dx/rop/type/Type.java b/dx/src/main/java/com/android/dx/rop/type/Type.java
index c564fab..c564fab 100644
--- a/src/dx/java/com/android/dx/rop/type/Type.java
+++ b/dx/src/main/java/com/android/dx/rop/type/Type.java
diff --git a/src/dx/java/com/android/dx/rop/type/TypeBearer.java b/dx/src/main/java/com/android/dx/rop/type/TypeBearer.java
index b03dbaf..b03dbaf 100644
--- a/src/dx/java/com/android/dx/rop/type/TypeBearer.java
+++ b/dx/src/main/java/com/android/dx/rop/type/TypeBearer.java
diff --git a/src/dx/java/com/android/dx/rop/type/TypeList.java b/dx/src/main/java/com/android/dx/rop/type/TypeList.java
index de2d62e..de2d62e 100644
--- a/src/dx/java/com/android/dx/rop/type/TypeList.java
+++ b/dx/src/main/java/com/android/dx/rop/type/TypeList.java
diff --git a/src/dx/java/com/android/dx/ssa/BasicRegisterMapper.java b/dx/src/main/java/com/android/dx/ssa/BasicRegisterMapper.java
index 83045b2..83045b2 100644
--- a/src/dx/java/com/android/dx/ssa/BasicRegisterMapper.java
+++ b/dx/src/main/java/com/android/dx/ssa/BasicRegisterMapper.java
diff --git a/src/dx/java/com/android/dx/ssa/ConstCollector.java b/dx/src/main/java/com/android/dx/ssa/ConstCollector.java
index 62d629f..62d629f 100644
--- a/src/dx/java/com/android/dx/ssa/ConstCollector.java
+++ b/dx/src/main/java/com/android/dx/ssa/ConstCollector.java
diff --git a/src/dx/java/com/android/dx/ssa/DeadCodeRemover.java b/dx/src/main/java/com/android/dx/ssa/DeadCodeRemover.java
index 07fb553..07fb553 100644
--- a/src/dx/java/com/android/dx/ssa/DeadCodeRemover.java
+++ b/dx/src/main/java/com/android/dx/ssa/DeadCodeRemover.java
diff --git a/src/dx/java/com/android/dx/ssa/DomFront.java b/dx/src/main/java/com/android/dx/ssa/DomFront.java
index 941a317..941a317 100644
--- a/src/dx/java/com/android/dx/ssa/DomFront.java
+++ b/dx/src/main/java/com/android/dx/ssa/DomFront.java
diff --git a/src/dx/java/com/android/dx/ssa/Dominators.java b/dx/src/main/java/com/android/dx/ssa/Dominators.java
index 503e857..503e857 100644
--- a/src/dx/java/com/android/dx/ssa/Dominators.java
+++ b/dx/src/main/java/com/android/dx/ssa/Dominators.java
diff --git a/src/dx/java/com/android/dx/ssa/EscapeAnalysis.java b/dx/src/main/java/com/android/dx/ssa/EscapeAnalysis.java
index b02c929..b02c929 100644
--- a/src/dx/java/com/android/dx/ssa/EscapeAnalysis.java
+++ b/dx/src/main/java/com/android/dx/ssa/EscapeAnalysis.java
diff --git a/src/dx/java/com/android/dx/ssa/InterferenceRegisterMapper.java b/dx/src/main/java/com/android/dx/ssa/InterferenceRegisterMapper.java
index 851249b..851249b 100644
--- a/src/dx/java/com/android/dx/ssa/InterferenceRegisterMapper.java
+++ b/dx/src/main/java/com/android/dx/ssa/InterferenceRegisterMapper.java
diff --git a/src/dx/java/com/android/dx/ssa/LiteralOpUpgrader.java b/dx/src/main/java/com/android/dx/ssa/LiteralOpUpgrader.java
index f3976f2..f3976f2 100644
--- a/src/dx/java/com/android/dx/ssa/LiteralOpUpgrader.java
+++ b/dx/src/main/java/com/android/dx/ssa/LiteralOpUpgrader.java
diff --git a/src/dx/java/com/android/dx/ssa/LocalVariableExtractor.java b/dx/src/main/java/com/android/dx/ssa/LocalVariableExtractor.java
index 11d53cf..11d53cf 100644
--- a/src/dx/java/com/android/dx/ssa/LocalVariableExtractor.java
+++ b/dx/src/main/java/com/android/dx/ssa/LocalVariableExtractor.java
diff --git a/src/dx/java/com/android/dx/ssa/LocalVariableInfo.java b/dx/src/main/java/com/android/dx/ssa/LocalVariableInfo.java
index 8845270..8845270 100644
--- a/src/dx/java/com/android/dx/ssa/LocalVariableInfo.java
+++ b/dx/src/main/java/com/android/dx/ssa/LocalVariableInfo.java
diff --git a/src/dx/java/com/android/dx/ssa/MoveParamCombiner.java b/dx/src/main/java/com/android/dx/ssa/MoveParamCombiner.java
index 41660d2..41660d2 100644
--- a/src/dx/java/com/android/dx/ssa/MoveParamCombiner.java
+++ b/dx/src/main/java/com/android/dx/ssa/MoveParamCombiner.java
diff --git a/src/dx/java/com/android/dx/ssa/NormalSsaInsn.java b/dx/src/main/java/com/android/dx/ssa/NormalSsaInsn.java
index cfef400..cfef400 100644
--- a/src/dx/java/com/android/dx/ssa/NormalSsaInsn.java
+++ b/dx/src/main/java/com/android/dx/ssa/NormalSsaInsn.java
diff --git a/src/dx/java/com/android/dx/ssa/Optimizer.java b/dx/src/main/java/com/android/dx/ssa/Optimizer.java
index 42ae166..42ae166 100644
--- a/src/dx/java/com/android/dx/ssa/Optimizer.java
+++ b/dx/src/main/java/com/android/dx/ssa/Optimizer.java
diff --git a/src/dx/java/com/android/dx/ssa/PhiInsn.java b/dx/src/main/java/com/android/dx/ssa/PhiInsn.java
index bc9c4b0..bc9c4b0 100644
--- a/src/dx/java/com/android/dx/ssa/PhiInsn.java
+++ b/dx/src/main/java/com/android/dx/ssa/PhiInsn.java
diff --git a/src/dx/java/com/android/dx/ssa/PhiTypeResolver.java b/dx/src/main/java/com/android/dx/ssa/PhiTypeResolver.java
index 4b8b4e3..4b8b4e3 100644
--- a/src/dx/java/com/android/dx/ssa/PhiTypeResolver.java
+++ b/dx/src/main/java/com/android/dx/ssa/PhiTypeResolver.java
diff --git a/src/dx/java/com/android/dx/ssa/RegisterMapper.java b/dx/src/main/java/com/android/dx/ssa/RegisterMapper.java
index bef941f..bef941f 100644
--- a/src/dx/java/com/android/dx/ssa/RegisterMapper.java
+++ b/dx/src/main/java/com/android/dx/ssa/RegisterMapper.java
diff --git a/src/dx/java/com/android/dx/ssa/SCCP.java b/dx/src/main/java/com/android/dx/ssa/SCCP.java
index 1c869e1..1c869e1 100644
--- a/src/dx/java/com/android/dx/ssa/SCCP.java
+++ b/dx/src/main/java/com/android/dx/ssa/SCCP.java
diff --git a/src/dx/java/com/android/dx/ssa/SetFactory.java b/dx/src/main/java/com/android/dx/ssa/SetFactory.java
index 92e965f..92e965f 100644
--- a/src/dx/java/com/android/dx/ssa/SetFactory.java
+++ b/dx/src/main/java/com/android/dx/ssa/SetFactory.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaBasicBlock.java b/dx/src/main/java/com/android/dx/ssa/SsaBasicBlock.java
index 499f59f..499f59f 100644
--- a/src/dx/java/com/android/dx/ssa/SsaBasicBlock.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaBasicBlock.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaConverter.java b/dx/src/main/java/com/android/dx/ssa/SsaConverter.java
index 5cd8b6f..5cd8b6f 100644
--- a/src/dx/java/com/android/dx/ssa/SsaConverter.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaConverter.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaInsn.java b/dx/src/main/java/com/android/dx/ssa/SsaInsn.java
index ca7a1a2..ca7a1a2 100644
--- a/src/dx/java/com/android/dx/ssa/SsaInsn.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaInsn.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaMethod.java b/dx/src/main/java/com/android/dx/ssa/SsaMethod.java
index 4c2bd85..4c2bd85 100644
--- a/src/dx/java/com/android/dx/ssa/SsaMethod.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaMethod.java
diff --git a/src/dx/java/com/android/dx/ssa/SsaRenamer.java b/dx/src/main/java/com/android/dx/ssa/SsaRenamer.java
index 58e4142..58e4142 100644
--- a/src/dx/java/com/android/dx/ssa/SsaRenamer.java
+++ b/dx/src/main/java/com/android/dx/ssa/SsaRenamer.java
diff --git a/src/dx/java/com/android/dx/ssa/back/FirstFitAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/FirstFitAllocator.java
index 6416e84..6416e84 100644
--- a/src/dx/java/com/android/dx/ssa/back/FirstFitAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/FirstFitAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java
index 9ef95a7..9ef95a7 100644
--- a/src/dx/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/FirstFitLocalCombiningAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java b/dx/src/main/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java
index 515b04f..515b04f 100644
--- a/src/dx/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/IdenticalBlockCombiner.java
diff --git a/src/dx/java/com/android/dx/ssa/back/InterferenceGraph.java b/dx/src/main/java/com/android/dx/ssa/back/InterferenceGraph.java
index e6cde62..e6cde62 100644
--- a/src/dx/java/com/android/dx/ssa/back/InterferenceGraph.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/InterferenceGraph.java
diff --git a/src/dx/java/com/android/dx/ssa/back/LivenessAnalyzer.java b/dx/src/main/java/com/android/dx/ssa/back/LivenessAnalyzer.java
index a293e6f..a293e6f 100644
--- a/src/dx/java/com/android/dx/ssa/back/LivenessAnalyzer.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/LivenessAnalyzer.java
diff --git a/src/dx/java/com/android/dx/ssa/back/NullRegisterAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/NullRegisterAllocator.java
index 0205c11..0205c11 100644
--- a/src/dx/java/com/android/dx/ssa/back/NullRegisterAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/NullRegisterAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/RegisterAllocator.java b/dx/src/main/java/com/android/dx/ssa/back/RegisterAllocator.java
index 1f9f70f..1f9f70f 100644
--- a/src/dx/java/com/android/dx/ssa/back/RegisterAllocator.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/RegisterAllocator.java
diff --git a/src/dx/java/com/android/dx/ssa/back/SsaToRop.java b/dx/src/main/java/com/android/dx/ssa/back/SsaToRop.java
index 0e30250..0e30250 100644
--- a/src/dx/java/com/android/dx/ssa/back/SsaToRop.java
+++ b/dx/src/main/java/com/android/dx/ssa/back/SsaToRop.java
diff --git a/src/dx/java/com/android/dx/util/AnnotatedOutput.java b/dx/src/main/java/com/android/dx/util/AnnotatedOutput.java
index 7a9ea29..7a9ea29 100644
--- a/src/dx/java/com/android/dx/util/AnnotatedOutput.java
+++ b/dx/src/main/java/com/android/dx/util/AnnotatedOutput.java
diff --git a/src/dx/java/com/android/dx/util/BitIntSet.java b/dx/src/main/java/com/android/dx/util/BitIntSet.java
index b364f0c..b364f0c 100644
--- a/src/dx/java/com/android/dx/util/BitIntSet.java
+++ b/dx/src/main/java/com/android/dx/util/BitIntSet.java
diff --git a/src/dx/java/com/android/dx/util/Bits.java b/dx/src/main/java/com/android/dx/util/Bits.java
index cbc0a5b..cbc0a5b 100644
--- a/src/dx/java/com/android/dx/util/Bits.java
+++ b/dx/src/main/java/com/android/dx/util/Bits.java
diff --git a/src/dx/java/com/android/dx/util/ByteArray.java b/dx/src/main/java/com/android/dx/util/ByteArray.java
index 21d0457..21d0457 100644
--- a/src/dx/java/com/android/dx/util/ByteArray.java
+++ b/dx/src/main/java/com/android/dx/util/ByteArray.java
diff --git a/src/dx/java/com/android/dx/util/ByteArrayAnnotatedOutput.java b/dx/src/main/java/com/android/dx/util/ByteArrayAnnotatedOutput.java
index 05ec733..05ec733 100644
--- a/src/dx/java/com/android/dx/util/ByteArrayAnnotatedOutput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteArrayAnnotatedOutput.java
diff --git a/src/dx/java/com/android/dx/util/ByteArrayByteInput.java b/dx/src/main/java/com/android/dx/util/ByteArrayByteInput.java
index 07c543f..07c543f 100644
--- a/src/dx/java/com/android/dx/util/ByteArrayByteInput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteArrayByteInput.java
diff --git a/src/dx/java/com/android/dx/util/ByteInput.java b/dx/src/main/java/com/android/dx/util/ByteInput.java
index 8181e3e..8181e3e 100644
--- a/src/dx/java/com/android/dx/util/ByteInput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteInput.java
diff --git a/src/dx/java/com/android/dx/util/ByteOutput.java b/dx/src/main/java/com/android/dx/util/ByteOutput.java
index 512dcf8..512dcf8 100644
--- a/src/dx/java/com/android/dx/util/ByteOutput.java
+++ b/dx/src/main/java/com/android/dx/util/ByteOutput.java
diff --git a/src/dx/java/com/android/dx/util/DexException.java b/dx/src/main/java/com/android/dx/util/DexException.java
index 527b0b9..527b0b9 100644
--- a/src/dx/java/com/android/dx/util/DexException.java
+++ b/dx/src/main/java/com/android/dx/util/DexException.java
diff --git a/src/dx/java/com/android/dx/util/ExceptionWithContext.java b/dx/src/main/java/com/android/dx/util/ExceptionWithContext.java
index 7f8523c..7f8523c 100644
--- a/src/dx/java/com/android/dx/util/ExceptionWithContext.java
+++ b/dx/src/main/java/com/android/dx/util/ExceptionWithContext.java
diff --git a/src/dx/java/com/android/dx/util/FileUtils.java b/dx/src/main/java/com/android/dx/util/FileUtils.java
index bcf6729..bcf6729 100644
--- a/src/dx/java/com/android/dx/util/FileUtils.java
+++ b/dx/src/main/java/com/android/dx/util/FileUtils.java
diff --git a/src/dx/java/com/android/dx/util/FixedSizeList.java b/dx/src/main/java/com/android/dx/util/FixedSizeList.java
index fb3af04..fb3af04 100644
--- a/src/dx/java/com/android/dx/util/FixedSizeList.java
+++ b/dx/src/main/java/com/android/dx/util/FixedSizeList.java
diff --git a/src/dx/java/com/android/dx/util/Hex.java b/dx/src/main/java/com/android/dx/util/Hex.java
index e95669c..e95669c 100644
--- a/src/dx/java/com/android/dx/util/Hex.java
+++ b/dx/src/main/java/com/android/dx/util/Hex.java
diff --git a/src/dx/java/com/android/dx/util/HexParser.java b/dx/src/main/java/com/android/dx/util/HexParser.java
index 1b34345..1b34345 100644
--- a/src/dx/java/com/android/dx/util/HexParser.java
+++ b/dx/src/main/java/com/android/dx/util/HexParser.java
diff --git a/src/dx/java/com/android/dx/util/IndentingWriter.java b/dx/src/main/java/com/android/dx/util/IndentingWriter.java
index 3424e37..3424e37 100644
--- a/src/dx/java/com/android/dx/util/IndentingWriter.java
+++ b/dx/src/main/java/com/android/dx/util/IndentingWriter.java
diff --git a/src/dx/java/com/android/dx/util/IntIterator.java b/dx/src/main/java/com/android/dx/util/IntIterator.java
index 4caa439..4caa439 100644
--- a/src/dx/java/com/android/dx/util/IntIterator.java
+++ b/dx/src/main/java/com/android/dx/util/IntIterator.java
diff --git a/src/dx/java/com/android/dx/util/IntList.java b/dx/src/main/java/com/android/dx/util/IntList.java
index be400aa..be400aa 100644
--- a/src/dx/java/com/android/dx/util/IntList.java
+++ b/dx/src/main/java/com/android/dx/util/IntList.java
diff --git a/src/dx/java/com/android/dx/util/IntSet.java b/dx/src/main/java/com/android/dx/util/IntSet.java
index 33b6bdd..33b6bdd 100644
--- a/src/dx/java/com/android/dx/util/IntSet.java
+++ b/dx/src/main/java/com/android/dx/util/IntSet.java
diff --git a/src/dx/java/com/android/dx/util/LabeledItem.java b/dx/src/main/java/com/android/dx/util/LabeledItem.java
index b4856cf..b4856cf 100644
--- a/src/dx/java/com/android/dx/util/LabeledItem.java
+++ b/dx/src/main/java/com/android/dx/util/LabeledItem.java
diff --git a/src/dx/java/com/android/dx/util/LabeledList.java b/dx/src/main/java/com/android/dx/util/LabeledList.java
index 963b5aa..963b5aa 100644
--- a/src/dx/java/com/android/dx/util/LabeledList.java
+++ b/dx/src/main/java/com/android/dx/util/LabeledList.java
diff --git a/src/dx/java/com/android/dx/util/Leb128Utils.java b/dx/src/main/java/com/android/dx/util/Leb128Utils.java
index 1037463..1037463 100644
--- a/src/dx/java/com/android/dx/util/Leb128Utils.java
+++ b/dx/src/main/java/com/android/dx/util/Leb128Utils.java
diff --git a/src/dx/java/com/android/dx/util/ListIntSet.java b/dx/src/main/java/com/android/dx/util/ListIntSet.java
index 2b4fc21..2b4fc21 100644
--- a/src/dx/java/com/android/dx/util/ListIntSet.java
+++ b/dx/src/main/java/com/android/dx/util/ListIntSet.java
diff --git a/src/dx/java/com/android/dx/util/MutabilityControl.java b/dx/src/main/java/com/android/dx/util/MutabilityControl.java
index 14e0f2e..14e0f2e 100644
--- a/src/dx/java/com/android/dx/util/MutabilityControl.java
+++ b/dx/src/main/java/com/android/dx/util/MutabilityControl.java
diff --git a/src/dx/java/com/android/dx/util/MutabilityException.java b/dx/src/main/java/com/android/dx/util/MutabilityException.java
index bd21651..bd21651 100644
--- a/src/dx/java/com/android/dx/util/MutabilityException.java
+++ b/dx/src/main/java/com/android/dx/util/MutabilityException.java
diff --git a/src/dx/java/com/android/dx/util/Mutf8.java b/dx/src/main/java/com/android/dx/util/Mutf8.java
index fe55724..fe55724 100644
--- a/src/dx/java/com/android/dx/util/Mutf8.java
+++ b/dx/src/main/java/com/android/dx/util/Mutf8.java
diff --git a/src/dx/java/com/android/dx/util/Output.java b/dx/src/main/java/com/android/dx/util/Output.java
index e5956a2..e5956a2 100644
--- a/src/dx/java/com/android/dx/util/Output.java
+++ b/dx/src/main/java/com/android/dx/util/Output.java
diff --git a/src/dx/java/com/android/dx/util/ToHuman.java b/dx/src/main/java/com/android/dx/util/ToHuman.java
index b3a31a5..b3a31a5 100644
--- a/src/dx/java/com/android/dx/util/ToHuman.java
+++ b/dx/src/main/java/com/android/dx/util/ToHuman.java
diff --git a/src/dx/java/com/android/dx/util/TwoColumnOutput.java b/dx/src/main/java/com/android/dx/util/TwoColumnOutput.java
index ed2ab9f..ed2ab9f 100644
--- a/src/dx/java/com/android/dx/util/TwoColumnOutput.java
+++ b/dx/src/main/java/com/android/dx/util/TwoColumnOutput.java
diff --git a/src/dx/java/com/android/dx/util/Uint.java b/dx/src/main/java/com/android/dx/util/Uint.java
index 039756a..039756a 100644
--- a/src/dx/java/com/android/dx/util/Uint.java
+++ b/dx/src/main/java/com/android/dx/util/Uint.java
diff --git a/src/dx/java/com/android/dx/util/Unsigned.java b/dx/src/main/java/com/android/dx/util/Unsigned.java
index f15bd86..f15bd86 100644
--- a/src/dx/java/com/android/dx/util/Unsigned.java
+++ b/dx/src/main/java/com/android/dx/util/Unsigned.java
diff --git a/src/dx/java/com/android/dx/util/Warning.java b/dx/src/main/java/com/android/dx/util/Warning.java
index 3c23c7c..3c23c7c 100644
--- a/src/dx/java/com/android/dx/util/Warning.java
+++ b/dx/src/main/java/com/android/dx/util/Warning.java
diff --git a/src/dx/java/com/android/dx/util/Writers.java b/dx/src/main/java/com/android/dx/util/Writers.java
index eba845c..eba845c 100644
--- a/src/dx/java/com/android/dx/util/Writers.java
+++ b/dx/src/main/java/com/android/dx/util/Writers.java
diff --git a/mockito/pom.xml b/mockito/pom.xml
new file mode 100644
index 0000000..c2bb0b9
--- /dev/null
+++ b/mockito/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.crittercism.dexmaker</groupId>
+ <artifactId>dexmaker-parent</artifactId>
+ <version>1.3</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>dexmaker-mockito</artifactId>
+ <packaging>jar</packaging>
+ <name>dexmaker mockito</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.crittercism.dexmaker</groupId>
+ <artifactId>dexmaker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.5</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
index 5063d75..15db475 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/DexmakerMockMaker.java
@@ -17,7 +17,6 @@
package com.google.dexmaker.mockito;
import com.google.dexmaker.stock.ProxyBuilder;
-import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.util.Set;
@@ -58,9 +57,7 @@ public final class DexmakerMockMaker implements MockMaker, StackTraceCleanerProv
.implementing(extraInterfaces)
.buildProxyClass();
T mock = unsafeAllocator.newInstance(proxyClass);
- Field handlerField = proxyClass.getDeclaredField("$__handler");
- handlerField.setAccessible(true);
- handlerField.set(mock, invocationHandler);
+ ProxyBuilder.setInvocationHandler(mock, invocationHandler);
return mock;
} catch (RuntimeException e) {
throw e;
diff --git a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java b/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
index 2775a63..cf062b9 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/InvocationHandlerAdapter.java
@@ -19,6 +19,8 @@ package com.google.dexmaker.mockito;
import com.google.dexmaker.stock.ProxyBuilder;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
import org.mockito.internal.invocation.InvocationImpl;
import org.mockito.internal.invocation.MockitoMethod;
import org.mockito.internal.invocation.realmethod.RealMethod;
@@ -92,5 +94,9 @@ final class InvocationHandlerAdapter implements InvocationHandler {
public Object invoke(Object target, Object[] arguments) throws Throwable {
return ProxyBuilder.callSuper(target, method, arguments);
}
+
+ public boolean isAbstract() {
+ return Modifier.isAbstract(method.getModifiers());
+ }
}
}
diff --git a/src/mockito/java/com/google/dexmaker/mockito/UnsafeAllocator.java b/mockito/src/main/java/com/google/dexmaker/mockito/UnsafeAllocator.java
index 2e10b41..2e10b41 100644
--- a/src/mockito/java/com/google/dexmaker/mockito/UnsafeAllocator.java
+++ b/mockito/src/main/java/com/google/dexmaker/mockito/UnsafeAllocator.java
diff --git a/src/mockito/resources/mockito-extensions/org.mockito.plugins.MockMaker b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
index 9f6df44..9f6df44 100644
--- a/src/mockito/resources/mockito-extensions/org.mockito.plugins.MockMaker
+++ b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/src/mockito/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider
index 9f6df44..9f6df44 100644
--- a/src/mockito/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider
+++ b/mockito/src/main/resources/mockito-extensions/org.mockito.plugins.StackTraceCleanerProvider
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..76a7c0c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <groupId>com.crittercism.dexmaker</groupId>
+ <artifactId>dexmaker-parent</artifactId>
+ <version>1.3</version>
+ <packaging>pom</packaging>
+
+ <name>dexmaker parent</name>
+ <url>https://github.com/crittercism/dexmaker</url>
+
+ <modules>
+ <module>dx</module>
+ <module>dexmaker</module>
+ <module>mockito</module>
+ </modules>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- Compilation -->
+ <java.version>1.5</java.version>
+
+ <!-- Test Dependencies -->
+ <junit.version>3.8.1</junit.version>
+ </properties>
+
+ <scm>
+ <connection>scm:git:git://github.com/crittercism/dexmaker.git</connection>
+ <developerConnection>scm:git:git@github.com:crittercism/dexmaker.git</developerConnection>
+ <url>https://github.com/crittercism/dexmaker</url>
+ </scm>
+
+ <issueManagement>
+ <system>GitHub Issues</system>
+ <url>https://github.com/crittercism/dexmaker/issues</url>
+ </issueManagement>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ <repository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.4.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.9</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.4</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>true</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 08:09:15 +0000