commit 7bd8ca78f3830c4a9ea51598fe48aee43fb6d8c0
author android-build-team Robot <android-build-team-robot@google.com> Thu Dec 14 00:19:41 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Dec 14 00:19:41 2017 +0000
tree 94cbae2592571a40f4118939e79a7afde0d5eb9b
parent e62c0cec8c6ff36a1f8f2fd4f5c9aff6c431058d
parent 568aba3bcced2cbd989e8fac8a3279819c862d6d

Merge cherrypicks of [3359449, 3359642, 3361564, 3359450, 3359451, 3361565, 3359507] into pi-release

Change-Id: Ia692c5043a476dfd669e6f9020c246764a1d6536

scripts/baksmali

diff --git a/scripts/baksmali b/scripts/baksmali
index 2e8addc..f2bfe75 100755
--- a/scripts/baksmali
+++ b/scripts/baksmali
@@ -35,7 +35,7 @@
 cd "${oldwd}"
 
 
-jarfile=baksmalilib.jar
+jarfile=baksmali.jar
 libdir="$progdir"
 
 if [ ! -r "$libdir/$jarfile" ]; then

scripts/smali

diff --git a/scripts/smali b/scripts/smali
index a55d112..71f8e2b 100755
--- a/scripts/smali
+++ b/scripts/smali
@@ -35,7 +35,7 @@
 cd "${oldwd}"
 
 
-jarfile=smalilib.jar
+jarfile=smali.jar
 libdir="$progdir"
 
 if [ ! -r "$libdir/$jarfile" ]; then