%1$s BETA (Minecraft Java launcher for Android), version " + PathTools.usingVerName + "\n" +
@@ -2947,7 +2951,7 @@ containing a value of this type.
MainActivity: strings
*/
- public static final int mcn_exit_title=0x7f0a005b;
+ public static final int mcn_exit_title=0x7f0a005c;
public static final int status_bar_notification_info_overflow=0x7f0a0016;
public static final int toast_login_error=0x7f0a0047;
/** Toast messages
@@ -2955,7 +2959,7 @@ containing a value of this type.
public static final int toast_permission_denied=0x7f0a0046;
/** Update part (unused now)
*/
- public static final int update_console=0x7f0a0077;
+ public static final int update_console=0x7f0a0078;
public static final int warning_action_exit=0x7f0a003c;
public static final int warning_action_install=0x7f0a003a;
public static final int warning_action_tryanyway=0x7f0a003b;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 355be8f41..c4b2a70ca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,9 +17,9 @@
android:resizeableActivity="true">
@@ -29,34 +29,27 @@
-
-
-
diff --git a/app/src/main/assets/about_en.txt b/app/src/main/assets/about_en.txt
new file mode 100644
index 000000000..0fc73dd05
--- /dev/null
+++ b/app/src/main/assets/about_en.txt
@@ -0,0 +1,15 @@
+%s BETA (Minecraft Java launcher for Android), version %s by Tran Khanh Duy (based from "Boardwalk" app)
+Using libraries:
+ • LWJGL %s.
+ • gl4es: OpenGL for OpenGL ES devices by lunixbochs and ptitSeb.
+ • openal_soft: OpenAL port for Android devices by apportable.
+ • javax.sound.midi backport for Android by kshoji.
+ • PojavDX (dx 1.16): tool to convert java bytecode to dex.
+ • Java AWT Implementation includes:
+ - Boardwalk's makeshift.
+ - OpenJDK 7 codes implementation.
+ - Developer codes (copy text, open browser,...)
+* Notes:
+ - This app is under development and will not be stable.
+ - This app only use LWJGL2 and didn't have a JRE8 desugar so 1.13 or above versions will not supported.
+ - This app is not affiliated with Minecraft, Mojang or Microsoft.
diff --git a/app/src/main/assets/current_changelog.txt b/app/src/main/assets/current_changelog.txt
index 839238963..8a5c6e0c5 100644
--- a/app/src/main/assets/current_changelog.txt
+++ b/app/src/main/assets/current_changelog.txt
@@ -1,15 +1,19 @@
-Version 2.4.1
+Version 2.4.2
* Changed (user):
- Translate is easier than before.
- UI layout now fit to the big screen.
- Fixed click event triggered after touch screen.
+- Migrated libraries, versions, gamedir folders to /sdcard/games/minecraft
* Changed (development):
- Redesigned partially of UI.
- Added 'Do not show again' to warning to unsupported Android version.
- Moved strings to /res/values/strings.xml for easy translating.
- Fixed touch event trigger as click on LWJGL (exist from Boardwalk)
+- Migrate all folders to single to match Java.
+- Added javax.sound.midi, javax.script.
+- Moved to use JsonArguments
* The first as '#' for FIXED or DID IT.
* Or as '$' for PARTIAL '#'.
diff --git a/app/src/main/java/com/android/dx/cf/direct/package.html b/app/src/main/java/com/android/dx/cf/direct/package.html
deleted file mode 100644
index 2a4619843..000000000
--- a/app/src/main/java/com/android/dx/cf/direct/package.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Implementation of cf.iface.* based on a direct representation
-of class files as byte[]s.
-
-PACKAGES USED:
-
-com.android.dx.cf.attribcom.android.dx.cf.ifacecom.android.dx.rop.poolcom.android.dx.util
-
diff --git a/app/src/main/java/com/android/dx/dex/cf/package.html b/app/src/main/java/com/android/dx/dex/cf/package.html
deleted file mode 100644
index d56e8a759..000000000
--- a/app/src/main/java/com/android/dx/dex/cf/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Classes for translating Java classfiles into Dalvik classes.
-
-PACKAGES USED:
-
-com.android.dx.cf.codecom.android.dx.cf.directcom.android.dx.cf.ifacecom.android.dx.dex.codecom.android.dx.dex.filecom.android.dx.rop.codecom.android.dx.rop.cstcom.android.dx.util
-
diff --git a/app/src/main/java/com/android/dex/Annotation.java b/app/src/main/java/com/pojavdx/dex/Annotation.java
similarity index 95%
rename from app/src/main/java/com/android/dex/Annotation.java
rename to app/src/main/java/com/pojavdx/dex/Annotation.java
index e9627acd9..bcfe4619a 100644
--- a/app/src/main/java/com/android/dex/Annotation.java
+++ b/app/src/main/java/com/pojavdx/dex/Annotation.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import static com.android.dex.EncodedValueReader.ENCODED_ANNOTATION;
+import static com.pojavdx.dex.EncodedValueReader.ENCODED_ANNOTATION;
/**
* An annotation.
diff --git a/app/src/main/java/com/android/dex/CallSiteId.java b/app/src/main/java/com/pojavdx/dex/CallSiteId.java
similarity index 93%
rename from app/src/main/java/com/android/dex/CallSiteId.java
rename to app/src/main/java/com/pojavdx/dex/CallSiteId.java
index 6c9a62327..d884c821b 100644
--- a/app/src/main/java/com/android/dex/CallSiteId.java
+++ b/app/src/main/java/com/pojavdx/dex/CallSiteId.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.Dex.Section;
-import com.android.dex.util.Unsigned;
+import com.pojavdx.dex.Dex.Section;
+import com.pojavdx.dex.util.Unsigned;
/**
* A call_site_id_item: https://source.android.com/devices/tech/dalvik/dex-format#call-site-id-item
diff --git a/app/src/main/java/com/android/dex/ClassData.java b/app/src/main/java/com/pojavdx/dex/ClassData.java
similarity index 99%
rename from app/src/main/java/com/android/dex/ClassData.java
rename to app/src/main/java/com/pojavdx/dex/ClassData.java
index 45238b728..0938fb9bb 100644
--- a/app/src/main/java/com/android/dex/ClassData.java
+++ b/app/src/main/java/com/pojavdx/dex/ClassData.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
public final class ClassData {
private final Field[] staticFields;
diff --git a/app/src/main/java/com/android/dex/ClassDef.java b/app/src/main/java/com/pojavdx/dex/ClassDef.java
similarity index 99%
rename from app/src/main/java/com/android/dex/ClassDef.java
rename to app/src/main/java/com/pojavdx/dex/ClassDef.java
index 4432e1439..9211ad75e 100644
--- a/app/src/main/java/com/android/dex/ClassDef.java
+++ b/app/src/main/java/com/pojavdx/dex/ClassDef.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
/**
* A type definition.
diff --git a/app/src/main/java/com/android/dex/Code.java b/app/src/main/java/com/pojavdx/dex/Code.java
similarity index 99%
rename from app/src/main/java/com/android/dex/Code.java
rename to app/src/main/java/com/pojavdx/dex/Code.java
index 9258af795..5da975465 100644
--- a/app/src/main/java/com/android/dex/Code.java
+++ b/app/src/main/java/com/pojavdx/dex/Code.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
public final class Code {
private final int registersSize;
diff --git a/app/src/main/java/com/android/dex/Dex.java b/app/src/main/java/com/pojavdx/dex/Dex.java
similarity index 99%
rename from app/src/main/java/com/android/dex/Dex.java
rename to app/src/main/java/com/pojavdx/dex/Dex.java
index 6b1bb5bff..25c7b84c8 100644
--- a/app/src/main/java/com/android/dex/Dex.java
+++ b/app/src/main/java/com/pojavdx/dex/Dex.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.Code.CatchHandler;
-import com.android.dex.Code.Try;
-import com.android.dex.MethodHandle.MethodHandleType;
-import com.android.dex.util.ByteInput;
-import com.android.dex.util.ByteOutput;
-import com.android.dex.util.FileUtils;
+import com.pojavdx.dex.Code.CatchHandler;
+import com.pojavdx.dex.Code.Try;
+import com.pojavdx.dex.MethodHandle.MethodHandleType;
+import com.pojavdx.dex.util.ByteInput;
+import com.pojavdx.dex.util.ByteOutput;
+import com.pojavdx.dex.util.FileUtils;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
diff --git a/app/src/main/java/com/android/dex/DexException.java b/app/src/main/java/com/pojavdx/dex/DexException.java
similarity index 92%
rename from app/src/main/java/com/android/dex/DexException.java
rename to app/src/main/java/com/pojavdx/dex/DexException.java
index ee0af18f9..a8408b86b 100644
--- a/app/src/main/java/com/android/dex/DexException.java
+++ b/app/src/main/java/com/pojavdx/dex/DexException.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.ExceptionWithContext;
+import com.pojavdx.dex.util.ExceptionWithContext;
/**
* Thrown when there's a format problem reading, writing, or generally
diff --git a/app/src/main/java/com/android/dex/DexFormat.java b/app/src/main/java/com/pojavdx/dex/DexFormat.java
similarity index 97%
rename from app/src/main/java/com/android/dex/DexFormat.java
rename to app/src/main/java/com/pojavdx/dex/DexFormat.java
index f66587506..4369b792e 100644
--- a/app/src/main/java/com/android/dex/DexFormat.java
+++ b/app/src/main/java/com/pojavdx/dex/DexFormat.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
/**
* Constants that show up in and are otherwise related to {@code .dex}
@@ -97,13 +97,13 @@ public final class DexFormat {
* The largest addressable member is 0xffff, in the "instruction formats" spec as field@CCCC or
* meth@CCCC.
*/
- public static final int MAX_MEMBER_IDX = 0xFFF; // 0xFFFF
+ public static /* final */ int MAX_MEMBER_IDX = 0x2222; // 0xFFFF
/**
* Maximum addressable type index.
* The largest addressable type is 0xffff, in the "instruction formats" spec as type@CCCC.
*/
- public static final int MAX_TYPE_IDX = 0xFFF; // 65535
+ public static /* final */ int MAX_TYPE_IDX = 0x2222; // 65535
/**
* Returns the API level corresponding to the given magic number,
diff --git a/app/src/main/java/com/android/dex/DexIndexOverflowException.java b/app/src/main/java/com/pojavdx/dex/DexIndexOverflowException.java
similarity index 97%
rename from app/src/main/java/com/android/dex/DexIndexOverflowException.java
rename to app/src/main/java/com/pojavdx/dex/DexIndexOverflowException.java
index 32262072b..c40d0eddb 100644
--- a/app/src/main/java/com/android/dex/DexIndexOverflowException.java
+++ b/app/src/main/java/com/pojavdx/dex/DexIndexOverflowException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
/**
* Thrown when there's an index overflow writing a dex file.
diff --git a/app/src/main/java/com/android/dex/EncodedValue.java b/app/src/main/java/com/pojavdx/dex/EncodedValue.java
similarity index 93%
rename from app/src/main/java/com/android/dex/EncodedValue.java
rename to app/src/main/java/com/pojavdx/dex/EncodedValue.java
index d5e75b029..c528e1703 100644
--- a/app/src/main/java/com/android/dex/EncodedValue.java
+++ b/app/src/main/java/com/pojavdx/dex/EncodedValue.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.ByteArrayByteInput;
-import com.android.dex.util.ByteInput;
+import com.pojavdx.dex.util.ByteArrayByteInput;
+import com.pojavdx.dex.util.ByteInput;
/**
* An encoded value or array.
diff --git a/app/src/main/java/com/android/dex/EncodedValueCodec.java b/app/src/main/java/com/pojavdx/dex/EncodedValueCodec.java
similarity index 98%
rename from app/src/main/java/com/android/dex/EncodedValueCodec.java
rename to app/src/main/java/com/pojavdx/dex/EncodedValueCodec.java
index 7fc172434..63070517d 100644
--- a/app/src/main/java/com/android/dex/EncodedValueCodec.java
+++ b/app/src/main/java/com/pojavdx/dex/EncodedValueCodec.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.ByteInput;
-import com.android.dex.util.ByteOutput;
+import com.pojavdx.dex.util.ByteInput;
+import com.pojavdx.dex.util.ByteOutput;
/**
* Read and write {@code encoded_value} primitives.
diff --git a/app/src/main/java/com/android/dex/EncodedValueReader.java b/app/src/main/java/com/pojavdx/dex/EncodedValueReader.java
similarity index 99%
rename from app/src/main/java/com/android/dex/EncodedValueReader.java
rename to app/src/main/java/com/pojavdx/dex/EncodedValueReader.java
index 24dc0e374..7290968c8 100644
--- a/app/src/main/java/com/android/dex/EncodedValueReader.java
+++ b/app/src/main/java/com/pojavdx/dex/EncodedValueReader.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.ByteInput;
+import com.pojavdx.dex.util.ByteInput;
/**
* Pull parser for encoded values.
diff --git a/app/src/main/java/com/android/dex/FieldId.java b/app/src/main/java/com/pojavdx/dex/FieldId.java
similarity index 97%
rename from app/src/main/java/com/android/dex/FieldId.java
rename to app/src/main/java/com/pojavdx/dex/FieldId.java
index f78df9e50..8a3b43a25 100644
--- a/app/src/main/java/com/android/dex/FieldId.java
+++ b/app/src/main/java/com/pojavdx/dex/FieldId.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.Unsigned;
+import com.pojavdx.dex.util.Unsigned;
public final class FieldId implements Comparable {
private final Dex dex;
diff --git a/app/src/main/java/com/android/dex/Leb128.java b/app/src/main/java/com/pojavdx/dex/Leb128.java
similarity index 97%
rename from app/src/main/java/com/android/dex/Leb128.java
rename to app/src/main/java/com/pojavdx/dex/Leb128.java
index e4ca5002d..6bb923c21 100644
--- a/app/src/main/java/com/android/dex/Leb128.java
+++ b/app/src/main/java/com/pojavdx/dex/Leb128.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.ByteInput;
-import com.android.dex.util.ByteOutput;
+import com.pojavdx.dex.util.ByteInput;
+import com.pojavdx.dex.util.ByteOutput;
/**
* Reads and writes DWARFv3 LEB 128 signed and unsigned integers. See DWARF v3
diff --git a/app/src/main/java/com/android/dex/MethodHandle.java b/app/src/main/java/com/pojavdx/dex/MethodHandle.java
similarity index 97%
rename from app/src/main/java/com/android/dex/MethodHandle.java
rename to app/src/main/java/com/pojavdx/dex/MethodHandle.java
index 9772f5402..31d11b055 100644
--- a/app/src/main/java/com/android/dex/MethodHandle.java
+++ b/app/src/main/java/com/pojavdx/dex/MethodHandle.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.Dex.Section;
-import com.android.dex.util.Unsigned;
+import com.pojavdx.dex.Dex.Section;
+import com.pojavdx.dex.util.Unsigned;
/**
* A method_handle_item:
diff --git a/app/src/main/java/com/android/dex/MethodId.java b/app/src/main/java/com/pojavdx/dex/MethodId.java
similarity index 97%
rename from app/src/main/java/com/android/dex/MethodId.java
rename to app/src/main/java/com/pojavdx/dex/MethodId.java
index ff3ca3ecf..1c7534554 100644
--- a/app/src/main/java/com/android/dex/MethodId.java
+++ b/app/src/main/java/com/pojavdx/dex/MethodId.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.Unsigned;
+import com.pojavdx.dex.util.Unsigned;
public final class MethodId implements Comparable {
private final Dex dex;
diff --git a/app/src/main/java/com/android/dex/Mutf8.java b/app/src/main/java/com/pojavdx/dex/Mutf8.java
similarity index 98%
rename from app/src/main/java/com/android/dex/Mutf8.java
rename to app/src/main/java/com/pojavdx/dex/Mutf8.java
index df3f3159d..97d254795 100644
--- a/app/src/main/java/com/android/dex/Mutf8.java
+++ b/app/src/main/java/com/pojavdx/dex/Mutf8.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.ByteInput;
+import com.pojavdx.dex.util.ByteInput;
import java.io.UTFDataFormatException;
/**
diff --git a/app/src/main/java/com/android/dex/ProtoId.java b/app/src/main/java/com/pojavdx/dex/ProtoId.java
similarity index 97%
rename from app/src/main/java/com/android/dex/ProtoId.java
rename to app/src/main/java/com/pojavdx/dex/ProtoId.java
index b60362017..e32204839 100644
--- a/app/src/main/java/com/android/dex/ProtoId.java
+++ b/app/src/main/java/com/pojavdx/dex/ProtoId.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.Unsigned;
+import com.pojavdx.dex.util.Unsigned;
public final class ProtoId implements Comparable {
private final Dex dex;
diff --git a/app/src/main/java/com/android/dex/SizeOf.java b/app/src/main/java/com/pojavdx/dex/SizeOf.java
similarity index 99%
rename from app/src/main/java/com/android/dex/SizeOf.java
rename to app/src/main/java/com/pojavdx/dex/SizeOf.java
index 479525008..7ad3d3a2b 100644
--- a/app/src/main/java/com/android/dex/SizeOf.java
+++ b/app/src/main/java/com/pojavdx/dex/SizeOf.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
public final class SizeOf {
private SizeOf() {}
diff --git a/app/src/main/java/com/android/dex/TableOfContents.java b/app/src/main/java/com/pojavdx/dex/TableOfContents.java
similarity index 99%
rename from app/src/main/java/com/android/dex/TableOfContents.java
rename to app/src/main/java/com/pojavdx/dex/TableOfContents.java
index 34836103a..77a7a6dee 100644
--- a/app/src/main/java/com/android/dex/TableOfContents.java
+++ b/app/src/main/java/com/pojavdx/dex/TableOfContents.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
diff --git a/app/src/main/java/com/android/dex/TypeList.java b/app/src/main/java/com/pojavdx/dex/TypeList.java
similarity index 96%
rename from app/src/main/java/com/android/dex/TypeList.java
rename to app/src/main/java/com/pojavdx/dex/TypeList.java
index b54e1846c..07cf8f8c5 100644
--- a/app/src/main/java/com/android/dex/TypeList.java
+++ b/app/src/main/java/com/pojavdx/dex/TypeList.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dex;
+package com.pojavdx.dex;
-import com.android.dex.util.Unsigned;
+import com.pojavdx.dex.util.Unsigned;
public final class TypeList implements Comparable {
diff --git a/app/src/main/java/com/android/dex/util/ByteArrayByteInput.java b/app/src/main/java/com/pojavdx/dex/util/ByteArrayByteInput.java
similarity index 96%
rename from app/src/main/java/com/android/dex/util/ByteArrayByteInput.java
rename to app/src/main/java/com/pojavdx/dex/util/ByteArrayByteInput.java
index 054c9afc9..d5a296327 100644
--- a/app/src/main/java/com/android/dex/util/ByteArrayByteInput.java
+++ b/app/src/main/java/com/pojavdx/dex/util/ByteArrayByteInput.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex.util;
+package com.pojavdx.dex.util;
public final class ByteArrayByteInput implements ByteInput {
diff --git a/app/src/main/java/com/android/dex/util/ByteInput.java b/app/src/main/java/com/pojavdx/dex/util/ByteInput.java
similarity index 96%
rename from app/src/main/java/com/android/dex/util/ByteInput.java
rename to app/src/main/java/com/pojavdx/dex/util/ByteInput.java
index f1a719614..003040986 100644
--- a/app/src/main/java/com/android/dex/util/ByteInput.java
+++ b/app/src/main/java/com/pojavdx/dex/util/ByteInput.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex.util;
+package com.pojavdx.dex.util;
/**
* A byte source.
diff --git a/app/src/main/java/com/android/dex/util/ByteOutput.java b/app/src/main/java/com/pojavdx/dex/util/ByteOutput.java
similarity index 96%
rename from app/src/main/java/com/android/dex/util/ByteOutput.java
rename to app/src/main/java/com/pojavdx/dex/util/ByteOutput.java
index eb77040ec..45759e1d4 100644
--- a/app/src/main/java/com/android/dex/util/ByteOutput.java
+++ b/app/src/main/java/com/pojavdx/dex/util/ByteOutput.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex.util;
+package com.pojavdx.dex.util;
/**
* A byte sink.
diff --git a/app/src/main/java/com/android/dex/util/ExceptionWithContext.java b/app/src/main/java/com/pojavdx/dex/util/ExceptionWithContext.java
similarity index 99%
rename from app/src/main/java/com/android/dex/util/ExceptionWithContext.java
rename to app/src/main/java/com/pojavdx/dex/util/ExceptionWithContext.java
index 5dfd95474..ed09b0679 100644
--- a/app/src/main/java/com/android/dex/util/ExceptionWithContext.java
+++ b/app/src/main/java/com/pojavdx/dex/util/ExceptionWithContext.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex.util;
+package com.pojavdx.dex.util;
import java.io.PrintStream;
import java.io.PrintWriter;
diff --git a/app/src/main/java/com/android/dex/util/FileUtils.java b/app/src/main/java/com/pojavdx/dex/util/FileUtils.java
similarity index 98%
rename from app/src/main/java/com/android/dex/util/FileUtils.java
rename to app/src/main/java/com/pojavdx/dex/util/FileUtils.java
index 4cea95c59..59beb1f88 100644
--- a/app/src/main/java/com/android/dex/util/FileUtils.java
+++ b/app/src/main/java/com/pojavdx/dex/util/FileUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex.util;
+package com.pojavdx.dex.util;
import java.io.File;
import java.io.FileInputStream;
diff --git a/app/src/main/java/com/android/dex/util/Unsigned.java b/app/src/main/java/com/pojavdx/dex/util/Unsigned.java
similarity index 97%
rename from app/src/main/java/com/android/dex/util/Unsigned.java
rename to app/src/main/java/com/pojavdx/dex/util/Unsigned.java
index cb50d0a40..f05f3d3a0 100644
--- a/app/src/main/java/com/android/dex/util/Unsigned.java
+++ b/app/src/main/java/com/pojavdx/dex/util/Unsigned.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dex.util;
+package com.pojavdx.dex.util;
/**
* Unsigned arithmetic over Java's signed types.
diff --git a/app/src/main/java/com/android/dx/Version.java b/app/src/main/java/com/pojavdx/dx/Version.java
similarity index 96%
rename from app/src/main/java/com/android/dx/Version.java
rename to app/src/main/java/com/pojavdx/dx/Version.java
index 8bc56d1ed..7bba22f61 100644
--- a/app/src/main/java/com/android/dx/Version.java
+++ b/app/src/main/java/com/pojavdx/dx/Version.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dx;
+package com.pojavdx.dx;
/**
* Version number for dx.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttAnnotationDefault.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttAnnotationDefault.java
similarity index 96%
rename from app/src/main/java/com/android/dx/cf/attrib/AttAnnotationDefault.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttAnnotationDefault.java
index 2fff0b872..fe447c6b8 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttAnnotationDefault.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttAnnotationDefault.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.Constant;
+import com.pojavdx.dx.rop.cst.Constant;
/**
* Attribute class for {@code AnnotationDefault} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttBootstrapMethods.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttBootstrapMethods.java
similarity index 95%
rename from app/src/main/java/com/android/dx/cf/attrib/AttBootstrapMethods.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttBootstrapMethods.java
index acb2f54a2..b281565ed 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttBootstrapMethods.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttBootstrapMethods.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.code.BootstrapMethodsList;
+import com.pojavdx.dx.cf.code.BootstrapMethodsList;
/**
* Attribute class for standard {@code AttBootstrapMethods} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttCode.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttCode.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/AttCode.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttCode.java
index 5cf1a546a..d8a91355f 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttCode.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttCode.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.code.ByteCatchList;
-import com.android.dx.cf.code.BytecodeArray;
-import com.android.dx.cf.iface.AttributeList;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.cf.code.ByteCatchList;
+import com.pojavdx.dx.cf.code.BytecodeArray;
+import com.pojavdx.dx.cf.iface.AttributeList;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Attribute class for standard {@code Code} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttConstantValue.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttConstantValue.java
similarity index 89%
rename from app/src/main/java/com/android/dx/cf/attrib/AttConstantValue.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttConstantValue.java
index 6a4a64cdc..0fd68a552 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttConstantValue.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttConstantValue.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.CstDouble;
-import com.android.dx.rop.cst.CstFloat;
-import com.android.dx.rop.cst.CstInteger;
-import com.android.dx.rop.cst.CstLong;
-import com.android.dx.rop.cst.CstString;
-import com.android.dx.rop.cst.TypedConstant;
+import com.pojavdx.dx.rop.cst.CstDouble;
+import com.pojavdx.dx.rop.cst.CstFloat;
+import com.pojavdx.dx.rop.cst.CstInteger;
+import com.pojavdx.dx.rop.cst.CstLong;
+import com.pojavdx.dx.rop.cst.CstString;
+import com.pojavdx.dx.rop.cst.TypedConstant;
/**
* Attribute class for standard {@code ConstantValue} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttDeprecated.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttDeprecated.java
similarity index 96%
rename from app/src/main/java/com/android/dx/cf/attrib/AttDeprecated.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttDeprecated.java
index ec65d358b..9233f61ad 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttDeprecated.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttDeprecated.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
/**
* Attribute class for standard {@code Deprecated} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttEnclosingMethod.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttEnclosingMethod.java
similarity index 95%
rename from app/src/main/java/com/android/dx/cf/attrib/AttEnclosingMethod.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttEnclosingMethod.java
index a413ca239..3d3d3676d 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttEnclosingMethod.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttEnclosingMethod.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.CstNat;
-import com.android.dx.rop.cst.CstType;
+import com.pojavdx.dx.rop.cst.CstNat;
+import com.pojavdx.dx.rop.cst.CstType;
/**
* Attribute class for standards-track {@code EnclosingMethod}
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttExceptions.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttExceptions.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/AttExceptions.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttExceptions.java
index 0a15f09f7..e4544e918 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttExceptions.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttExceptions.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.type.TypeList;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.rop.type.TypeList;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Attribute class for standard {@code Exceptions} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttInnerClasses.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttInnerClasses.java
similarity index 95%
rename from app/src/main/java/com/android/dx/cf/attrib/AttInnerClasses.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttInnerClasses.java
index 5dc3607e1..07361e9cf 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttInnerClasses.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttInnerClasses.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Attribute class for standard {@code InnerClasses} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttLineNumberTable.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttLineNumberTable.java
similarity index 93%
rename from app/src/main/java/com/android/dx/cf/attrib/AttLineNumberTable.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttLineNumberTable.java
index 1887984df..7f4457bee 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttLineNumberTable.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttLineNumberTable.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.code.LineNumberList;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.cf.code.LineNumberList;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Attribute class for standard {@code LineNumberTable} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttLocalVariableTable.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttLocalVariableTable.java
similarity index 93%
rename from app/src/main/java/com/android/dx/cf/attrib/AttLocalVariableTable.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttLocalVariableTable.java
index 1d2b4aa01..183110aeb 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttLocalVariableTable.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttLocalVariableTable.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.code.LocalVariableList;
+import com.pojavdx.dx.cf.code.LocalVariableList;
/**
* Attribute class for standard {@code LocalVariableTable} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttLocalVariableTypeTable.java
similarity index 93%
rename from app/src/main/java/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttLocalVariableTypeTable.java
index 2520bf604..6358f3b92 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttLocalVariableTypeTable.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttLocalVariableTypeTable.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.code.LocalVariableList;
+import com.pojavdx.dx.cf.code.LocalVariableList;
/**
* Attribute class for standard {@code LocalVariableTypeTable} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java
index d3afe277f..eb286bc30 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeInvisibleAnnotations.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.annotation.Annotations;
+import com.pojavdx.dx.rop.annotation.Annotations;
/**
* Attribute class for standard {@code RuntimeInvisibleAnnotations}
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java
index c9c513694..8bb921920 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeInvisibleParameterAnnotations.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.annotation.AnnotationsList;
+import com.pojavdx.dx.rop.annotation.AnnotationsList;
/**
* Attribute class for standard
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeVisibleAnnotations.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeVisibleAnnotations.java
index a6a640d53..bac58f694 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeVisibleAnnotations.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeVisibleAnnotations.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.annotation.Annotations;
+import com.pojavdx.dx.rop.annotation.Annotations;
/**
* Attribute class for standard {@code RuntimeVisibleAnnotations}
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java
index 177eb4c9b..b372d2395 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttRuntimeVisibleParameterAnnotations.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.annotation.AnnotationsList;
+import com.pojavdx.dx.rop.annotation.AnnotationsList;
/**
* Attribute class for standard {@code RuntimeVisibleParameterAnnotations}
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttSignature.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSignature.java
similarity index 95%
rename from app/src/main/java/com/android/dx/cf/attrib/AttSignature.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttSignature.java
index 8709b483e..91f9f025c 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttSignature.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSignature.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.CstString;
+import com.pojavdx.dx.rop.cst.CstString;
/**
* Attribute class for standards-track {@code Signature} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttSourceDebugExtension.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSourceDebugExtension.java
similarity index 96%
rename from app/src/main/java/com/android/dx/cf/attrib/AttSourceDebugExtension.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttSourceDebugExtension.java
index 3dd4fecb1..0f9f2e120 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttSourceDebugExtension.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSourceDebugExtension.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.CstString;
+import com.pojavdx.dx.rop.cst.CstString;
/**
* Attribute class for standard {@code SourceDebugExtension} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttSourceFile.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSourceFile.java
similarity index 95%
rename from app/src/main/java/com/android/dx/cf/attrib/AttSourceFile.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttSourceFile.java
index 20ab70d36..ebcb85bd5 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttSourceFile.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSourceFile.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.CstString;
+import com.pojavdx.dx.rop.cst.CstString;
/**
* Attribute class for standard {@code SourceFile} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/AttSynthetic.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSynthetic.java
similarity index 96%
rename from app/src/main/java/com/android/dx/cf/attrib/AttSynthetic.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/AttSynthetic.java
index 1b2b4051c..15ffceb43 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/AttSynthetic.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/AttSynthetic.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
/**
* Attribute class for standard {@code Synthetic} attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/BaseAnnotations.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseAnnotations.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/BaseAnnotations.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/BaseAnnotations.java
index ce8448725..2c29edf04 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/BaseAnnotations.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseAnnotations.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.annotation.Annotations;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.rop.annotation.Annotations;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Base class for annotations attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/BaseAttribute.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseAttribute.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/BaseAttribute.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/BaseAttribute.java
index 1e5035cab..baf8f31bd 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/BaseAttribute.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseAttribute.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.iface.Attribute;
+import com.pojavdx.dx.cf.iface.Attribute;
/**
* Base implementation of {@link Attribute}, which directly stores
diff --git a/app/src/main/java/com/android/dx/cf/attrib/BaseLocalVariables.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseLocalVariables.java
similarity index 93%
rename from app/src/main/java/com/android/dx/cf/attrib/BaseLocalVariables.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/BaseLocalVariables.java
index f8909dbc3..f7a6d160a 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/BaseLocalVariables.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseLocalVariables.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.cf.code.LocalVariableList;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.cf.code.LocalVariableList;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Base attribute class for standard {@code LocalVariableTable}
diff --git a/app/src/main/java/com/android/dx/cf/attrib/BaseParameterAnnotations.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseParameterAnnotations.java
similarity index 94%
rename from app/src/main/java/com/android/dx/cf/attrib/BaseParameterAnnotations.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/BaseParameterAnnotations.java
index 45bc9c03b..4f877b6b0 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/BaseParameterAnnotations.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/BaseParameterAnnotations.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.annotation.AnnotationsList;
-import com.android.dx.util.MutabilityException;
+import com.pojavdx.dx.rop.annotation.AnnotationsList;
+import com.pojavdx.dx.util.MutabilityException;
/**
* Base class for parameter annotation list attributes.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/InnerClassList.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/InnerClassList.java
similarity index 96%
rename from app/src/main/java/com/android/dx/cf/attrib/InnerClassList.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/InnerClassList.java
index 830118c5a..965c27d54 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/InnerClassList.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/InnerClassList.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.CstString;
-import com.android.dx.rop.cst.CstType;
-import com.android.dx.util.FixedSizeList;
+import com.pojavdx.dx.rop.cst.CstString;
+import com.pojavdx.dx.rop.cst.CstType;
+import com.pojavdx.dx.util.FixedSizeList;
/**
* List of "inner class" entries, which are the contents of
diff --git a/app/src/main/java/com/android/dx/cf/attrib/RawAttribute.java b/app/src/main/java/com/pojavdx/dx/cf/attrib/RawAttribute.java
similarity index 95%
rename from app/src/main/java/com/android/dx/cf/attrib/RawAttribute.java
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/RawAttribute.java
index 2ac08d489..90d622da4 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/RawAttribute.java
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/RawAttribute.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.android.dx.cf.attrib;
+package com.pojavdx.dx.cf.attrib;
-import com.android.dx.rop.cst.ConstantPool;
-import com.android.dx.util.ByteArray;
+import com.pojavdx.dx.rop.cst.ConstantPool;
+import com.pojavdx.dx.util.ByteArray;
/**
* Raw attribute, for holding onto attributes that are unrecognized.
diff --git a/app/src/main/java/com/android/dx/cf/attrib/package.html b/app/src/main/java/com/pojavdx/dx/cf/attrib/package.html
similarity index 51%
rename from app/src/main/java/com/android/dx/cf/attrib/package.html
rename to app/src/main/java/com/pojavdx/dx/cf/attrib/package.html
index 8125079a4..ac8a3d08b 100644
--- a/app/src/main/java/com/android/dx/cf/attrib/package.html
+++ b/app/src/main/java/com/pojavdx/dx/cf/attrib/package.html
@@ -4,8 +4,8 @@ attribute types.
PACKAGES USED:
-com.android.dx.cf.ifacecom.android.dx.rop.poolcom.android.dx.utilcom.pojavdx.dx.cf.ifacecom.pojavdx.dx.rop.poolcom.pojavdx.dx.util