aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/smali14
-rw-r--r--smali/Android.bp2
-rw-r--r--smali/manifest.txt1
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