aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2014-07-01 17:23:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-07-01 17:23:49 +0000
commit4a27735df0978e91d4185553211a2200f87e2475 (patch)
treebdbe4e2338b12f189e75313bdc44f5f5ae9e8f70
parent9c384f6bfdde3564cfe76b2629c4532205a0b4da (diff)
parent89fede9eb51b123e0db1d3b70739d0c571104053 (diff)
downloadsdk-4a27735df0978e91d4185553211a2200f87e2475.zip
sdk-4a27735df0978e91d4185553211a2200f87e2475.tar.gz
sdk-4a27735df0978e91d4185553211a2200f87e2475.tar.bz2
Merge "Release proguard.bat in windows sdk" into idea133
automerge: 89fede9 * commit '89fede9eb51b123e0db1d3b70739d0c571104053': Release proguard.bat in windows sdk
-rw-r--r--build.gradle37
1 files changed, 24 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle
index fe2facd..733ba3c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,10 @@ sdk {
into 'proguard'
notice null
}
+ item('files/proguard-android.txt') {
+ into 'proguard'
+ notice null
+ }
item('files/proguard-android-optimize.txt') {
into 'proguard'
notice null
@@ -103,6 +107,13 @@ sdk {
notice null
}
+ item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties") {
+ into 'proguard/ant'
+ notice null
+ }
+ }
+
+ common(mac, linux) {
item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/proguard.sh") {
into 'proguard/bin'
notice null
@@ -117,23 +128,23 @@ sdk {
into 'proguard/bin'
notice null
}
+ }
- item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/src/proguard/ant/task.properties") {
- into 'proguard/ant'
+ windows {
+ item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/proguard.bat") {
+ into 'proguard/bin'
notice null
}
- }
-
- linux {
-
- }
-
- mac {
-
- }
- windows {
+ item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/proguardgui.bat") {
+ into 'proguard/bin'
+ notice null
+ }
+ item("$rootProject.projectDir.parentFile/prebuilts/tools/common/proguard/proguard4.7/bin/retrace.bat") {
+ into 'proguard/bin'
+ notice null
+ }
}
-} \ No newline at end of file
+}