diff options
| author | David Srbecky <dsrbecky@google.com> | 2023-12-11 16:45:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 16:45:38 +0000 |
| commit | 283aefaff3a20daf88501d089b03f5b25fe6de0b (patch) | |
| tree | e085443b349bf64fbbb7de04023ad3ba47e3f6a1 | |
| parent | b259065a165165c6bbbd0f1ba332cb5a43252a46 (diff) | |
| parent | 4f18c238ed0c32d3e1981b07c0a8d19c35faaead (diff) | |
| download | google-smali-283aefaff3a20daf88501d089b03f5b25fe6de0b.tar.gz | |
Merge "Ensure the baksmali command works on Android" into main am: d9dd3982dd am: 2c451aeeb5 am: 4f18c238ed
Original change: https://android-review.googlesource.com/c/platform/external/google-smali/+/2864790
Change-Id: Ic1e10e6996985a0050aa720a048941eb855a57e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | baksmali/Android.bp | 2 | ||||
| -rw-r--r-- | baksmali/manifest.txt | 1 | ||||
| -rwxr-xr-x | scripts/baksmali | 14 |
3 files changed, 10 insertions, 7 deletions
diff --git a/baksmali/Android.bp b/baksmali/Android.bp index ad333f86..6fc3f7ea 100644 --- a/baksmali/Android.bp +++ b/baksmali/Android.bp @@ -32,7 +32,7 @@ java_binary_host { ":third_party-smali-baksmali", ], - // manifest: "manifest.txt", + manifest: "manifest.txt", static_libs: [ "smali-dexlib2", diff --git a/baksmali/manifest.txt b/baksmali/manifest.txt new file mode 100644 index 00000000..b3eba648 --- /dev/null +++ b/baksmali/manifest.txt @@ -0,0 +1 @@ +Main-Class: com.android.tools.smali.baksmali.Main diff --git a/scripts/baksmali b/scripts/baksmali index bd3f820e..21622d4d 100755 --- a/scripts/baksmali +++ b/scripts/baksmali @@ -29,9 +29,6 @@ prog="$0" while [ -h "${prog}" ]; do newProg=`/bin/ls -ld "${prog}"` - echo ${newProg} - - newProg=`expr "${newProg}" : ".* -> \(.*\)$"` if expr "x${newProg}" : 'x/' >/dev/null; then prog="${newProg}" @@ -48,10 +45,15 @@ prog="${progdir}"/`basename "${prog}"` cd "${oldwd}" -jarfile=baksmali.jar +jarfile=smali-baksmali.jar libdir="$progdir" -if [ ! -r "$libdir/$jarfile" ] -then + +if [ ! -r "$libdir/$jarfile" ]; then + # set location for the Android tree case + libdir=`dirname "$progdir"`/framework +fi + +if [ ! -r "$libdir/$jarfile" ]; then echo `basename "$prog"`": can't find $jarfile" exit 1 fi |