[go: nahoru, domu]

Move to multi-platform builds.

Change-Id: I010cf533db44e1eba5cd60930de07dd06494b7ec
diff --git a/build.gradle b/build.gradle
index e197cf3..8b7f7a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,3 +21,20 @@
     // include swt for compilation
     sourceSets.main.compileClasspath += configurations.swt
 }
+
+apply plugin: 'sdk-files'
+
+sdk {
+    linux {
+        path("$rootProject.projectDir/../prebuilts/tools/linux-x86/swt/swt.jar")    { into 'lib/x86' }
+        path("$rootProject.projectDir/../prebuilts/tools/linux-x86_64/swt/swt.jar") { into 'lib/x86_64' }
+    }
+    mac {
+        path("$rootProject.projectDir/../prebuilts/tools/darwin-x86/swt/swt.jar")    { into 'lib/x86' }
+        path("$rootProject.projectDir/../prebuilts/tools/darwin-x86_64/swt/swt.jar") { into 'lib/x86_64' }
+    }
+    windows {
+        path("$rootProject.projectDir/../prebuilts/tools/windows/swt/swt.jar")        { into 'lib/x86' }
+        path("$rootProject.projectDir/../prebuilts/tools/windows-x86_64/swt/swt.jar") { into 'lib/x86_64' }
+    }
+}
diff --git a/ddms/app/build.gradle b/ddms/app/build.gradle
index 7ac2133..14c1032 100644
--- a/ddms/app/build.gradle
+++ b/ddms/app/build.gradle
@@ -9,10 +9,19 @@
     compile project(':ddmlib')
 }
 
-sdkPackaging {
-    launcherScripts = ['etc/ddms', 'etc/ddms.bat']
+sdk {
+    linux {
+       path('etc/ddms') { executable true }
+    }
+    mac {
+       path('etc/ddms') { executable true }
+    }
+    windows {
+       path 'etc/ddms.bat'
+    }
 }
 
+
 // configure the manifest of the buildDistributionJar task.
 sdkJar.manifest.attributes("Main-Class": "com.android.ddms.Main")
 
diff --git a/hierarchyviewer2/app/build.gradle b/hierarchyviewer2/app/build.gradle
index 07b822a..c5928ee 100644
--- a/hierarchyviewer2/app/build.gradle
+++ b/hierarchyviewer2/app/build.gradle
@@ -10,10 +10,19 @@
     compile project(':ddmlib')
 }
 
-sdkPackaging {
-    launcherScripts = ['etc/hierarchyviewer', 'etc/hierarchyviewer.bat']
+sdk {
+    linux {
+       path('etc/hierarchyviewer')  { executable true }
+    }
+    mac {
+       path('etc/hierarchyviewer')  { executable true }
+    }
+    windows {
+       path 'etc/hierarchyviewer.bat'
+    }
 }
 
+
 // include swt for compilation
 sourceSets.main.compileClasspath += configurations.swt
 
diff --git a/monkeyrunner/build.gradle b/monkeyrunner/build.gradle
index 9a9f67c..fe9a11b 100644
--- a/monkeyrunner/build.gradle
+++ b/monkeyrunner/build.gradle
@@ -20,11 +20,16 @@
     test.resources.srcDir 'src/test/java'
 }
 
-sdkPackaging {
-    launcherScripts = [
-      'etc/monkeyrunner.bat',
-      'etc/monkeyrunner',
-    ]
+sdk {
+    linux {
+       path('etc/monkeyrunner')  { executable true }
+    }
+    mac {
+       path('etc/monkeyrunner')  { executable true }
+    }
+    windows {
+       path 'etc/monkeyrunner.bat'
+    }
 }
 
 // configure the manifest of the buildDistributionJar task.
diff --git a/sdkmanager/app/build.gradle b/sdkmanager/app/build.gradle
index 5df8a1c..b476709 100644
--- a/sdkmanager/app/build.gradle
+++ b/sdkmanager/app/build.gradle
@@ -10,8 +10,16 @@
     testCompile 'junit:junit:3.8.1'
 }
 
-sdkPackaging {
-    launcherScripts = ['etc/android', 'etc/android.bat']
+sdk {
+    linux {
+       path('etc/android')  { executable true }
+    }
+    mac {
+       path('etc/android')  { executable true }
+    }
+    windows {
+       path 'etc/android.bat'
+    }
 }
 
 // configure the manifest of the buildDistributionJar task.
diff --git a/traceview/build.gradle b/traceview/build.gradle
index 2236f41..7db4794 100644
--- a/traceview/build.gradle
+++ b/traceview/build.gradle
@@ -6,8 +6,16 @@
     compile project(':common')
 }
 
-sdkPackaging {
-    launcherScripts = ['etc/traceview', 'etc/traceview.bat']
+sdk {
+    linux {
+       path('etc/traceview')  { executable true }
+    }
+    mac {
+       path('etc/traceview')  { executable true }
+    }
+    windows {
+       path 'etc/traceview.bat'
+    }
 }
 
 // configure the manifest of the buildDistributionJar task.
diff --git a/uiautomatorviewer/build.gradle b/uiautomatorviewer/build.gradle
index 83f42df..759886e 100644
--- a/uiautomatorviewer/build.gradle
+++ b/uiautomatorviewer/build.gradle
@@ -5,13 +5,22 @@
     compile project(':ddmlib')
 }
 
-sdkPackaging {
-    launcherScripts = ['etc/uiautomatorviewer', 'etc/uiautomatorviewer.bat']
+sourceSets {
+    main.resources.srcDir 'src/main/java'
+}
+
+sdk {
+    linux {
+       path('etc/uiautomatorviewer')  { executable true }
+    }
+    mac {
+       path('etc/uiautomatorviewer')  { executable true }
+    }
+    windows {
+       path 'etc/uiautomatorviewer.bat'
+    }
 }
 
 // configure the manifest of the buildDistributionJar task.
 sdkJar.manifest.attributes("Main-Class": "com.android.uiautomator.UiAutomatorViewer")
 
-sourceSets {
-    main.resources.srcDir 'src/main/java'
-}