diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-06-17 19:12:10 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@google.com> | 2014-06-17 19:57:29 -0700 |
| commit | dd044ae42546b9558db34d01b910626f29a86db7 (patch) | |
| tree | a96552a2a9808c1a3018c90e4839d553d759c4da | |
| parent | 1a16fac10556fed05bb662f1f853093b01f736ae (diff) | |
| download | sdk-dd044ae42546b9558db34d01b910626f29a86db7.zip sdk-dd044ae42546b9558db34d01b910626f29a86db7.tar.gz sdk-dd044ae42546b9558db34d01b910626f29a86db7.tar.bz2 | |
Make zipAlignExe come from Build-tools
Also package proguard-project.txt in sdk tools.
Change-Id: I82f61cc60d62c1412bba97e107a59ccecc1d851d
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | files/ant/build.xml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index d8acb68..350f466 100644 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,10 @@ sdk { into 'ant' notice 'files/ant/NOTICE' } + item('files/proguard-project.txt') { + into 'lib' + notice null + } item('files/devices.xml') { into 'lib' diff --git a/files/ant/build.xml b/files/ant/build.xml index 66d7139..222e7d1 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -157,7 +157,6 @@ <condition property="exe" value=".exe" else=""><os family="windows" /></condition> <condition property="bat" value=".bat" else=""><os family="windows" /></condition> <property name="adb" location="${android.platform.tools.dir}/adb${exe}" /> - <property name="zipalign" location="${android.tools.dir}/zipalign${exe}" /> <property name="lint" location="${android.tools.dir}/lint${bat}" /> <!-- Intermediate files --> @@ -485,6 +484,7 @@ <property name="aidl" location="${android.build.tools.dir}/aidl${exe}" /> <property name="aapt" location="${android.build.tools.dir}/aapt${exe}" /> <property name="dx" location="${android.build.tools.dir}/dx${bat}" /> + <property name="zipalign" location="${android.build.tools.dir}/zipalign${exe}" /> <!-- read the previous build mode --> <property file="${out.build.prop.file}" /> |