| commit | e18a27b35fc4e6834c36a90acc9d9ec923da41d1 | [log] [tgz] |
|---|---|---|
| author | Yusuke Sato <yusukes@google.com> | Mon Jun 29 17:49:28 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 29 17:49:31 2015 +0000 |
| tree | 6e3388e236f3302f0fc69a84100e566289e1a99b | |
| parent | 7c1fbd40e15802570453ae2230a4860a230d3ac0 [diff] | |
| parent | 67a6959b4afc8e1a366ad829ce59ad8017f4049d [diff] |
Merge "Rename ZipEntryName to ZipString"
diff --git a/dx/etc/mainDexClasses b/dx/etc/mainDexClasses index 178ab18..0a83c3d 100755 --- a/dx/etc/mainDexClasses +++ b/dx/etc/mainDexClasses
@@ -102,6 +102,10 @@ fi if [ ! -r "${proguard}" ]; then + proguard="${ANDROID_BUILD_TOP}"/external/proguard/bin/${proguardExec} +fi + +if [ ! -r "${proguard}" ]; then proguard="`which proguard`" fi