Changed namespace from org.jf to com.android.tools.smali (#4)

Included in this sweeping change: * Removed all imports using *. * Updated version to 3.0.0.
google · Jan 27, 2023 · 3713aed · 3713aed
1 parent 02e4132
commit 3713aed
Show file tree

Hide file tree

Showing 749 changed files with 4,384 additions and 3,435 deletions.
diff --git a/baksmali/build.gradle b/baksmali/build.gradle
@@ -67,7 +67,7 @@ task fatJar(type: Jar) {
     classifier = 'fat'
 
     manifest {
-        attributes('Main-Class': 'org.jf.baksmali.Main')
+        attributes('Main-Class': 'com.android.tools.smali.baksmali.Main')
     }
 
     doLast {
@@ -109,8 +109,8 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
     dontobfuscate
     dontoptimize
 
-    keep 'public class org.jf.baksmali.Main { public static void main(java.lang.String[]); }'
-    keep 'public class org.jf.util.jcommander.ColonParameterSplitter'
+    keep 'public class com.android.tools.smali.baksmali.Main { public static void main(java.lang.String[]); }'
+    keep 'public class com.android.tools.smali.util.jcommander.ColonParameterSplitter'
     keep 'class com.beust.jcommander.** { *; }'
     keepclassmembers 'enum * { public static **[] values(); public static ** valueOf(java.lang.String); }'
 

diff --git a/...i/Adaptors/CommentingIndentingWriter.java → ...i/Adaptors/CommentingIndentingWriter.java b/...i/Adaptors/CommentingIndentingWriter.java → ...i/Adaptors/CommentingIndentingWriter.java
@@ -28,9 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors;
+package com.android.tools.smali.baksmali.Adaptors;
 
-import org.jf.util.IndentingWriter;
+import com.android.tools.smali.util.IndentingWriter;
 
 import java.io.IOException;
 import java.io.Writer;

diff --git a/...aptors/Debug/BeginEpilogueMethodItem.java → ...aptors/Debug/BeginEpilogueMethodItem.java b/...aptors/Debug/BeginEpilogueMethodItem.java → ...aptors/Debug/BeginEpilogueMethodItem.java
@@ -28,9 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
 
 import java.io.IOException;
 

diff --git a/...smali/Adaptors/Debug/DebugMethodItem.java → ...smali/Adaptors/Debug/DebugMethodItem.java b/...smali/Adaptors/Debug/DebugMethodItem.java → ...smali/Adaptors/Debug/DebugMethodItem.java
@@ -28,14 +28,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.Adaptors.ClassDefinition;
-import org.jf.baksmali.Adaptors.MethodItem;
-import org.jf.baksmali.Adaptors.RegisterFormatter;
-import org.jf.dexlib2.DebugItemType;
-import org.jf.dexlib2.iface.debug.*;
-import org.jf.util.ExceptionWithContext;
+import com.android.tools.smali.dexlib2.iface.debug.DebugItem;
+import com.android.tools.smali.dexlib2.iface.debug.EndLocal;
+import com.android.tools.smali.dexlib2.iface.debug.LineNumber;
+import com.android.tools.smali.dexlib2.iface.debug.RestartLocal;
+import com.android.tools.smali.dexlib2.iface.debug.SetSourceFile;
+import com.android.tools.smali.dexlib2.iface.debug.StartLocal;
+import com.android.tools.smali.baksmali.Adaptors.ClassDefinition;
+import com.android.tools.smali.baksmali.Adaptors.MethodItem;
+import com.android.tools.smali.baksmali.Adaptors.RegisterFormatter;
+import com.android.tools.smali.dexlib2.DebugItemType;
+import com.android.tools.smali.util.ExceptionWithContext;
 
 public abstract class DebugMethodItem extends MethodItem {
     private final int sortOrder;

diff --git a/...li/Adaptors/Debug/EndLocalMethodItem.java → ...li/Adaptors/Debug/EndLocalMethodItem.java b/...li/Adaptors/Debug/EndLocalMethodItem.java → ...li/Adaptors/Debug/EndLocalMethodItem.java
@@ -28,11 +28,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.Adaptors.RegisterFormatter;
-import org.jf.baksmali.formatter.BaksmaliWriter;
-import org.jf.dexlib2.iface.debug.EndLocal;
+import com.android.tools.smali.baksmali.Adaptors.RegisterFormatter;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.dexlib2.iface.debug.EndLocal;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;

diff --git a/...Adaptors/Debug/EndPrologueMethodItem.java → ...Adaptors/Debug/EndPrologueMethodItem.java b/...Adaptors/Debug/EndPrologueMethodItem.java → ...Adaptors/Debug/EndPrologueMethodItem.java
@@ -28,9 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
 
 import java.io.IOException;
 

diff --git a/.../Adaptors/Debug/LineNumberMethodItem.java → .../Adaptors/Debug/LineNumberMethodItem.java b/.../Adaptors/Debug/LineNumberMethodItem.java → .../Adaptors/Debug/LineNumberMethodItem.java
@@ -28,10 +28,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.formatter.BaksmaliWriter;
-import org.jf.dexlib2.iface.debug.LineNumber;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.dexlib2.iface.debug.LineNumber;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;

diff --git a/...ksmali/Adaptors/Debug/LocalFormatter.java → ...ksmali/Adaptors/Debug/LocalFormatter.java b/...ksmali/Adaptors/Debug/LocalFormatter.java → ...ksmali/Adaptors/Debug/LocalFormatter.java
@@ -28,10 +28,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.formatter.BaksmaliWriter;
-import org.jf.dexlib2.immutable.value.ImmutableNullEncodedValue;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.dexlib2.immutable.value.ImmutableNullEncodedValue;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/...daptors/Debug/RestartLocalMethodItem.java → ...daptors/Debug/RestartLocalMethodItem.java b/...daptors/Debug/RestartLocalMethodItem.java → ...daptors/Debug/RestartLocalMethodItem.java
@@ -28,12 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.Adaptors.ClassDefinition;
-import org.jf.baksmali.Adaptors.RegisterFormatter;
-import org.jf.baksmali.formatter.BaksmaliWriter;
-import org.jf.dexlib2.iface.debug.RestartLocal;
+import com.android.tools.smali.baksmali.Adaptors.ClassDefinition;
+import com.android.tools.smali.baksmali.Adaptors.RegisterFormatter;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.dexlib2.iface.debug.RestartLocal;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;

diff --git a/...aptors/Debug/SetSourceFileMethodItem.java → ...aptors/Debug/SetSourceFileMethodItem.java b/...aptors/Debug/SetSourceFileMethodItem.java → ...aptors/Debug/SetSourceFileMethodItem.java
@@ -28,10 +28,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.formatter.BaksmaliWriter;
-import org.jf.dexlib2.iface.debug.SetSourceFile;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.dexlib2.iface.debug.SetSourceFile;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/.../Adaptors/Debug/StartLocalMethodItem.java → .../Adaptors/Debug/StartLocalMethodItem.java b/.../Adaptors/Debug/StartLocalMethodItem.java → .../Adaptors/Debug/StartLocalMethodItem.java
@@ -28,12 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali.Adaptors.Debug;
+package com.android.tools.smali.baksmali.Adaptors.Debug;
 
-import org.jf.baksmali.Adaptors.ClassDefinition;
-import org.jf.baksmali.Adaptors.RegisterFormatter;
-import org.jf.baksmali.formatter.BaksmaliWriter;
-import org.jf.dexlib2.iface.debug.StartLocal;
+import com.android.tools.smali.baksmali.Adaptors.ClassDefinition;
+import com.android.tools.smali.baksmali.Adaptors.RegisterFormatter;
+import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
+import com.android.tools.smali.dexlib2.iface.debug.StartLocal;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;

diff --git a/...va/org/jf/baksmali/AnalysisArguments.java → ...ols/smali/baksmali/AnalysisArguments.java b/...va/org/jf/baksmali/AnalysisArguments.java → ...ols/smali/baksmali/AnalysisArguments.java
@@ -28,26 +28,26 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
 import com.beust.jcommander.Parameter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import org.jf.dexlib2.VersionMap;
-import org.jf.dexlib2.analysis.ClassPath;
-import org.jf.dexlib2.analysis.ClassPathResolver;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
-import org.jf.dexlib2.dexbacked.OatFile;
-import org.jf.dexlib2.iface.MultiDexContainer;
-import org.jf.util.jcommander.ColonParameterSplitter;
-import org.jf.util.jcommander.ExtendedParameter;
+import com.android.tools.smali.dexlib2.VersionMap;
+import com.android.tools.smali.dexlib2.analysis.ClassPath;
+import com.android.tools.smali.dexlib2.analysis.ClassPathResolver;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.dexbacked.OatFile;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.util.jcommander.ColonParameterSplitter;
+import com.android.tools.smali.util.jcommander.ExtendedParameter;
 
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import static org.jf.dexlib2.analysis.ClassPath.NOT_SPECIFIED;
+import static com.android.tools.smali.dexlib2.analysis.ClassPath.NOT_SPECIFIED;
 
 public class AnalysisArguments {
     @Parameter(names = {"-b", "--bootclasspath", "--bcp"},

diff --git a/...java/org/jf/baksmali/BaksmaliOptions.java → ...tools/smali/baksmali/BaksmaliOptions.java b/...java/org/jf/baksmali/BaksmaliOptions.java → ...tools/smali/baksmali/BaksmaliOptions.java
@@ -28,11 +28,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
-import org.jf.dexlib2.analysis.ClassPath;
-import org.jf.dexlib2.analysis.InlineMethodResolver;
-import org.jf.dexlib2.util.SyntheticAccessorResolver;
+import com.android.tools.smali.dexlib2.analysis.ClassPath;
+import com.android.tools.smali.dexlib2.analysis.InlineMethodResolver;
+import com.android.tools.smali.dexlib2.util.SyntheticAccessorResolver;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

diff --git a/...n/java/org/jf/baksmali/DeodexCommand.java → ...d/tools/smali/baksmali/DeodexCommand.java b/...n/java/org/jf/baksmali/DeodexCommand.java → ...d/tools/smali/baksmali/DeodexCommand.java
@@ -28,18 +28,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.beust.jcommander.ParametersDelegate;
-import org.jf.baksmali.AnalysisArguments.CheckPackagePrivateArgument;
-import org.jf.dexlib2.analysis.CustomInlineMethodResolver;
-import org.jf.dexlib2.analysis.InlineMethodResolver;
-import org.jf.dexlib2.dexbacked.DexBackedOdexFile;
-import org.jf.util.jcommander.ExtendedParameter;
-import org.jf.util.jcommander.ExtendedParameters;
+import com.android.tools.smali.baksmali.AnalysisArguments.CheckPackagePrivateArgument;
+import com.android.tools.smali.dexlib2.analysis.CustomInlineMethodResolver;
+import com.android.tools.smali.dexlib2.analysis.InlineMethodResolver;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedOdexFile;
+import com.android.tools.smali.util.jcommander.ExtendedParameter;
+import com.android.tools.smali.util.jcommander.ExtendedParameters;
 
 import javax.annotation.Nonnull;
 import java.io.File;

diff --git a/...java/org/jf/baksmali/DexInputCommand.java → ...tools/smali/baksmali/DexInputCommand.java b/...java/org/jf/baksmali/DexInputCommand.java → ...tools/smali/baksmali/DexInputCommand.java
@@ -28,18 +28,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-import org.jf.dexlib2.DexFileFactory;
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
-import org.jf.dexlib2.iface.MultiDexContainer;
-import org.jf.util.jcommander.Command;
-import org.jf.util.jcommander.ExtendedParameter;
+import com.android.tools.smali.dexlib2.DexFileFactory;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.util.jcommander.Command;
+import com.android.tools.smali.util.jcommander.ExtendedParameter;
 
 import javax.annotation.Nonnull;
 import java.io.File;

diff --git a/...a/org/jf/baksmali/DisassembleCommand.java → ...ls/smali/baksmali/DisassembleCommand.java b/...a/org/jf/baksmali/DisassembleCommand.java → ...ls/smali/baksmali/DisassembleCommand.java
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
@@ -37,11 +37,11 @@
 import com.beust.jcommander.validators.PositiveInteger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.jf.dexlib2.util.SyntheticAccessorResolver;
-import org.jf.util.ConsoleUtil;
-import org.jf.util.StringWrapper;
-import org.jf.util.jcommander.ExtendedParameter;
-import org.jf.util.jcommander.ExtendedParameters;
+import com.android.tools.smali.dexlib2.util.SyntheticAccessorResolver;
+import com.android.tools.smali.util.ConsoleUtil;
+import com.android.tools.smali.util.StringWrapper;
+import com.android.tools.smali.util.jcommander.ExtendedParameter;
+import com.android.tools.smali.util.jcommander.ExtendedParameters;
 import org.xml.sax.SAXException;
 
 import javax.annotation.Nonnull;

diff --git a/...ain/java/org/jf/baksmali/DumpCommand.java → ...oid/tools/smali/baksmali/DumpCommand.java b/...ain/java/org/jf/baksmali/DumpCommand.java → ...oid/tools/smali/baksmali/DumpCommand.java
@@ -28,18 +28,22 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
-import org.jf.dexlib2.dexbacked.raw.util.DexAnnotator;
-import org.jf.util.ConsoleUtil;
-import org.jf.util.jcommander.ExtendedParameters;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.dexbacked.raw.util.DexAnnotator;
+import com.android.tools.smali.util.ConsoleUtil;
+import com.android.tools.smali.util.jcommander.ExtendedParameters;
 
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import javax.annotation.Nonnull;
-import java.io.*;
 import java.util.List;
 
 @Parameters(commandDescription = "Prints an annotated hex dump for the given dex file")

diff --git a/...ain/java/org/jf/baksmali/HelpCommand.java → ...oid/tools/smali/baksmali/HelpCommand.java b/...ain/java/org/jf/baksmali/HelpCommand.java → ...oid/tools/smali/baksmali/HelpCommand.java
@@ -28,15 +28,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
+import com.android.tools.smali.util.jcommander.Command;
+import com.android.tools.smali.util.jcommander.ExtendedCommands;
+import com.android.tools.smali.util.jcommander.ExtendedParameter;
+import com.android.tools.smali.util.jcommander.ExtendedParameters;
+import com.android.tools.smali.util.jcommander.HelpFormatter;
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.collect.Lists;
-import org.jf.util.ConsoleUtil;
-import org.jf.util.StringWrapper;
-import org.jf.util.jcommander.*;
+import com.android.tools.smali.util.ConsoleUtil;
+import com.android.tools.smali.util.StringWrapper;
 
 import javax.annotation.Nonnull;
 import java.util.List;

diff --git a/...a/org/jf/baksmali/ListClassesCommand.java → ...ls/smali/baksmali/ListClassesCommand.java b/...a/org/jf/baksmali/ListClassesCommand.java → ...ls/smali/baksmali/ListClassesCommand.java
@@ -28,14 +28,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.jf.baksmali;
+package com.android.tools.smali.baksmali;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import org.jf.baksmali.formatter.BaksmaliFormatter;
-import org.jf.dexlib2.iface.ClassDef;
-import org.jf.util.jcommander.ExtendedParameters;
+import com.android.tools.smali.baksmali.formatter.BaksmaliFormatter;
+import com.android.tools.smali.dexlib2.iface.ClassDef;
+import com.android.tools.smali.util.jcommander.ExtendedParameters;
 
 import javax.annotation.Nonnull;
 import java.util.List;