Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 27, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions baksmali/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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); }'

Expand Down
4 changes: 2 additions & 2 deletions ...i/Adaptors/CommentingIndentingWriter.java → ...i/Adaptors/CommentingIndentingWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...aptors/Debug/BeginEpilogueMethodItem.java → ...aptors/Debug/BeginEpilogueMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
19 changes: 12 additions & 7 deletions ...smali/Adaptors/Debug/DebugMethodItem.java → ...smali/Adaptors/Debug/DebugMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...li/Adaptors/Debug/EndLocalMethodItem.java → ...li/Adaptors/Debug/EndLocalMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...Adaptors/Debug/EndPrologueMethodItem.java → ...Adaptors/Debug/EndPrologueMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions .../Adaptors/Debug/LineNumberMethodItem.java → .../Adaptors/Debug/LineNumberMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ksmali/Adaptors/Debug/LocalFormatter.java → ...ksmali/Adaptors/Debug/LocalFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...daptors/Debug/RestartLocalMethodItem.java → ...daptors/Debug/RestartLocalMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...aptors/Debug/SetSourceFileMethodItem.java → ...aptors/Debug/SetSourceFileMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions .../Adaptors/Debug/StartLocalMethodItem.java → .../Adaptors/Debug/StartLocalMethodItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions ...va/org/jf/baksmali/AnalysisArguments.java → ...ols/smali/baksmali/AnalysisArguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
8 changes: 4 additions & 4 deletions ...java/org/jf/baksmali/BaksmaliOptions.java → ...tools/smali/baksmali/BaksmaliOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions ...n/java/org/jf/baksmali/DeodexCommand.java → ...d/tools/smali/baksmali/DeodexCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions ...java/org/jf/baksmali/DexInputCommand.java → ...tools/smali/baksmali/DexInputCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...a/org/jf/baksmali/DisassembleCommand.java → ...ls/smali/baksmali/DisassembleCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
16 changes: 10 additions & 6 deletions ...ain/java/org/jf/baksmali/DumpCommand.java → ...oid/tools/smali/baksmali/DumpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
12 changes: 8 additions & 4 deletions ...ain/java/org/jf/baksmali/HelpCommand.java → ...oid/tools/smali/baksmali/HelpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/jf/baksmali/ListClassesCommand.java → ...ls/smali/baksmali/ListClassesCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading