diff options
author | Xavier Ducrohet <xav@google.com> | 2014-06-27 19:14:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-27 19:14:41 +0000 |
commit | 9f15158b729daf26c8a5b5578078dc7e2927ca53 (patch) | |
tree | 0b61df7674ea56ca83b3fcf23c156a480041089f | |
parent | f3d94e255b59c2b2a3aa522609ea4507f1675780 (diff) | |
parent | af28256ec72fa740d08cdea73e25a5ab7e17449a (diff) | |
download | sdk-9f15158b729daf26c8a5b5578078dc7e2927ca53.zip sdk-9f15158b729daf26c8a5b5578078dc7e2927ca53.tar.gz sdk-9f15158b729daf26c8a5b5578078dc7e2927ca53.tar.bz2 |
am af28256e: Merge "Fix proguard packaging in the tools." into idea133 automerge: 327b773
* commit 'af28256ec72fa740d08cdea73e25a5ab7e17449a':
Fix proguard packaging in the tools.
-rw-r--r-- | build.gradle | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/build.gradle b/build.gradle index 350f466..fe2facd 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,14 @@ sdk { into 'lib' notice null } + item('files/proguard-project.txt') { + into 'proguard' + notice null + } + item('files/proguard-android-optimize.txt') { + into 'proguard' + notice null + } item('files/devices.xml') { into 'lib' @@ -69,6 +77,51 @@ sdk { into 'lib/pc-bios' notice null } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/license.html") { + into 'proguard' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/README") { + into 'proguard' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/docs") { + into 'proguard/docs' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/examples") { + into 'proguard/examples' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/lib") { + into 'proguard/lib' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/proguard.sh") { + into 'proguard/bin' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/proguardgui.sh") { + into 'proguard/bin' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/retrace.sh") { + into 'proguard/bin' + notice null + } + + item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties") { + into 'proguard/ant' + notice null + } } linux { |