diff --git a/.gitignore b/.gitignore index 6cc955d8..26e9b92e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ /dist /build.xml /target -/lib/target -/cli/target +/apktool-lib/target +/apktool-cli/target diff --git a/cli/pom.xml b/apktool-cli/pom.xml similarity index 100% rename from cli/pom.xml rename to apktool-cli/pom.xml diff --git a/cli/src/main/java/brut/apktool/Main.java b/apktool-cli/src/main/java/brut/apktool/Main.java similarity index 100% rename from cli/src/main/java/brut/apktool/Main.java rename to apktool-cli/src/main/java/brut/apktool/Main.java diff --git a/lib/pom.xml b/apktool-lib/pom.xml similarity index 100% rename from lib/pom.xml rename to apktool-lib/pom.xml diff --git a/lib/src/main/java/android/content/res/XmlResourceParser.java b/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java similarity index 100% rename from lib/src/main/java/android/content/res/XmlResourceParser.java rename to apktool-lib/src/main/java/android/content/res/XmlResourceParser.java diff --git a/lib/src/main/java/android/util/AttributeSet.java b/apktool-lib/src/main/java/android/util/AttributeSet.java similarity index 100% rename from lib/src/main/java/android/util/AttributeSet.java rename to apktool-lib/src/main/java/android/util/AttributeSet.java diff --git a/lib/src/main/java/android/util/TypedValue.java b/apktool-lib/src/main/java/android/util/TypedValue.java similarity index 100% rename from lib/src/main/java/android/util/TypedValue.java rename to apktool-lib/src/main/java/android/util/TypedValue.java diff --git a/lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java similarity index 100% rename from lib/src/main/java/brut/androlib/Androlib.java rename to apktool-lib/src/main/java/brut/androlib/Androlib.java diff --git a/lib/src/main/java/brut/androlib/AndrolibException.java b/apktool-lib/src/main/java/brut/androlib/AndrolibException.java similarity index 100% rename from lib/src/main/java/brut/androlib/AndrolibException.java rename to apktool-lib/src/main/java/brut/androlib/AndrolibException.java diff --git a/lib/src/main/java/brut/androlib/ApkDecoder.java b/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/ApkDecoder.java rename to apktool-lib/src/main/java/brut/androlib/ApkDecoder.java diff --git a/lib/src/main/java/brut/androlib/android-framework.jar b/apktool-lib/src/main/java/brut/androlib/android-framework.jar similarity index 100% rename from lib/src/main/java/brut/androlib/android-framework.jar rename to apktool-lib/src/main/java/brut/androlib/android-framework.jar diff --git a/lib/src/main/java/brut/androlib/err/CantFind9PatchChunk.java b/apktool-lib/src/main/java/brut/androlib/err/CantFind9PatchChunk.java similarity index 100% rename from lib/src/main/java/brut/androlib/err/CantFind9PatchChunk.java rename to apktool-lib/src/main/java/brut/androlib/err/CantFind9PatchChunk.java diff --git a/lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java b/apktool-lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java similarity index 100% rename from lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java rename to apktool-lib/src/main/java/brut/androlib/err/CantFindFrameworkResException.java diff --git a/lib/src/main/java/brut/androlib/err/OutDirExistsException.java b/apktool-lib/src/main/java/brut/androlib/err/OutDirExistsException.java similarity index 100% rename from lib/src/main/java/brut/androlib/err/OutDirExistsException.java rename to apktool-lib/src/main/java/brut/androlib/err/OutDirExistsException.java diff --git a/lib/src/main/java/brut/androlib/err/UndefinedResObject.java b/apktool-lib/src/main/java/brut/androlib/err/UndefinedResObject.java similarity index 100% rename from lib/src/main/java/brut/androlib/err/UndefinedResObject.java rename to apktool-lib/src/main/java/brut/androlib/err/UndefinedResObject.java diff --git a/lib/src/main/java/brut/androlib/java/AndrolibJava.java b/apktool-lib/src/main/java/brut/androlib/java/AndrolibJava.java similarity index 100% rename from lib/src/main/java/brut/androlib/java/AndrolibJava.java rename to apktool-lib/src/main/java/brut/androlib/java/AndrolibJava.java diff --git a/lib/src/main/java/brut/androlib/mod/BaksmaliMod.java b/apktool-lib/src/main/java/brut/androlib/mod/BaksmaliMod.java similarity index 100% rename from lib/src/main/java/brut/androlib/mod/BaksmaliMod.java rename to apktool-lib/src/main/java/brut/androlib/mod/BaksmaliMod.java diff --git a/lib/src/main/java/brut/androlib/mod/IndentingWriter.java b/apktool-lib/src/main/java/brut/androlib/mod/IndentingWriter.java similarity index 100% rename from lib/src/main/java/brut/androlib/mod/IndentingWriter.java rename to apktool-lib/src/main/java/brut/androlib/mod/IndentingWriter.java diff --git a/lib/src/main/java/brut/androlib/mod/SmaliMod.java b/apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java similarity index 100% rename from lib/src/main/java/brut/androlib/mod/SmaliMod.java rename to apktool-lib/src/main/java/brut/androlib/mod/SmaliMod.java diff --git a/lib/src/main/java/brut/androlib/res/AndrolibResources.java b/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/AndrolibResources.java rename to apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java diff --git a/lib/src/main/java/brut/androlib/res/ResSmaliUpdater.java b/apktool-lib/src/main/java/brut/androlib/res/ResSmaliUpdater.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/ResSmaliUpdater.java rename to apktool-lib/src/main/java/brut/androlib/res/ResSmaliUpdater.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResConfig.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResConfig.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResConfig.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResConfig.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResID.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResID.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResID.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResID.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResPackage.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResPackage.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResResSpec.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResResSpec.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResResource.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResResource.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResResource.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResResource.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResTable.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResTable.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResTable.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResType.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResType.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResType.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResType.java diff --git a/lib/src/main/java/brut/androlib/res/data/ResValuesFile.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResValuesFile.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/ResValuesFile.java rename to apktool-lib/src/main/java/brut/androlib/res/data/ResValuesFile.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResAttr.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResAttr.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResBoolValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResColorValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResColorValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResColorValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResColorValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResDimenValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResEnumAttr.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResFileValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResFlagsAttr.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResFloatValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResFractionValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResIntValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValue.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResValue.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResValue.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResXmlPrintable.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResXmlPrintable.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResXmlPrintable.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResXmlPrintable.java diff --git a/lib/src/main/java/brut/androlib/res/data/value/ResXmlSerializable.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResXmlSerializable.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/data/value/ResXmlSerializable.java rename to apktool-lib/src/main/java/brut/androlib/res/data/value/ResXmlSerializable.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/Res9patchStreamDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/ResRawStreamDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/ResStreamDecoderContainer.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/StringBlock.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/StringBlock.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java diff --git a/lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java rename to apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java diff --git a/lib/src/main/java/brut/androlib/res/util/ExtFile.java b/apktool-lib/src/main/java/brut/androlib/res/util/ExtFile.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/util/ExtFile.java rename to apktool-lib/src/main/java/brut/androlib/res/util/ExtFile.java diff --git a/lib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java b/apktool-lib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java similarity index 100% rename from lib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java rename to apktool-lib/src/main/java/brut/androlib/res/util/ExtMXSerializer.java diff --git a/lib/src/main/java/brut/androlib/src/DebugInjector.java b/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java similarity index 100% rename from lib/src/main/java/brut/androlib/src/DebugInjector.java rename to apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java diff --git a/lib/src/main/java/brut/androlib/src/DexFileBuilder.java b/apktool-lib/src/main/java/brut/androlib/src/DexFileBuilder.java similarity index 100% rename from lib/src/main/java/brut/androlib/src/DexFileBuilder.java rename to apktool-lib/src/main/java/brut/androlib/src/DexFileBuilder.java diff --git a/lib/src/main/java/brut/androlib/src/SmaliBuilder.java b/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java similarity index 100% rename from lib/src/main/java/brut/androlib/src/SmaliBuilder.java rename to apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java diff --git a/lib/src/main/java/brut/androlib/src/SmaliDecoder.java b/apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java similarity index 100% rename from lib/src/main/java/brut/androlib/src/SmaliDecoder.java rename to apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java diff --git a/lib/src/main/java/brut/androlib/src/TypeName.java b/apktool-lib/src/main/java/brut/androlib/src/TypeName.java similarity index 100% rename from lib/src/main/java/brut/androlib/src/TypeName.java rename to apktool-lib/src/main/java/brut/androlib/src/TypeName.java diff --git a/lib/src/main/java/com/mindprod/ledatastream/LEDataInputStream.java b/apktool-lib/src/main/java/com/mindprod/ledatastream/LEDataInputStream.java similarity index 100% rename from lib/src/main/java/com/mindprod/ledatastream/LEDataInputStream.java rename to apktool-lib/src/main/java/com/mindprod/ledatastream/LEDataInputStream.java diff --git a/pom.xml b/pom.xml index db805290..d927b9a9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,8 @@ - lib - cli + apktool-lib + apktool-cli