diff options
| author | David Srbecky <dsrbecky@google.com> | 2023-12-05 21:27:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-05 21:27:32 +0000 |
| commit | 0fb079e4b64d806596477beb1cf2eb7fbcf90803 (patch) | |
| tree | 8d082af9abaa6208049eeed0d5da3b5f2a0743ad | |
| parent | 65c97e1e3fcfa51f921db3d431c7f882cfd9cca1 (diff) | |
| parent | ec041ead7d350da3450ed1ffd6429697ac610ed3 (diff) | |
| download | google-smali-0fb079e4b64d806596477beb1cf2eb7fbcf90803.tar.gz | |
Ensure the smali script is runnable am: 2c17aa2189 am: 6a2d4387aa am: ec041ead7d
Original change: https://android-review.googlesource.com/c/platform/external/google-smali/+/2859646
Change-Id: I1e9f134f971220594a3c4e1921f9dddc84792ba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | scripts/smali | 14 | ||||
| -rw-r--r-- | smali/Android.bp | 2 | ||||
| -rw-r--r-- | smali/manifest.txt | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/scripts/smali b/scripts/smali index 9ede6758..238ff535 100755 --- a/scripts/smali +++ b/scripts/smali @@ -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=smali.jar +jarfile=android-smali.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 diff --git a/smali/Android.bp b/smali/Android.bp index 9a1d9325..73ec6520 100644 --- a/smali/Android.bp +++ b/smali/Android.bp @@ -31,6 +31,8 @@ java_binary_host { ":third_party-smali", ], + manifest: "manifest.txt", + static_libs: [ "antlr-runtime", "jcommander", diff --git a/smali/manifest.txt b/smali/manifest.txt new file mode 100644 index 00000000..d7879d58 --- /dev/null +++ b/smali/manifest.txt @@ -0,0 +1 @@ +Main-Class: com/android/tools/smali.smali.Main |