Update project setup.

Change-Id: I4129f12069ebfaba14cb358959b3a705b31097a9

13 files changed, 55 insertions, 52 deletions

diff --git a/build.gradle b/build.gradle
index 8b7f7a1..dbc4ebb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+apply from: "$rootDir/buildSrc/base/baseJava.gradle"
+
 // this applied only to swt/* projects
 subprojects { Project project ->
     // only configure leaf projects.
@@ -26,15 +28,15 @@ 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' }
+        item("$rootProject.projectDir.parentFile/prebuilts/tools/linux-x86/swt/swt.jar")    { into 'lib/x86' }
+        item("$rootProject.projectDir.parentFile/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' }
+        item("$rootProject.projectDir.parentFile/prebuilts/tools/darwin-x86/swt/swt.jar")    { into 'lib/x86' }
+        item("$rootProject.projectDir.parentFile/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' }
+        item("$rootProject.projectDir.parentFile/prebuilts/tools/windows/swt/swt.jar")        { into 'lib/x86' }
+        item("$rootProject.projectDir.parentFile/prebuilts/tools/windows-x86_64/swt/swt.jar") { into 'lib/x86_64' }
     }
 }
diff --git a/chimpchat/build.gradle b/chimpchat/build.gradle
index 18cca50..485376e 100644
--- a/chimpchat/build.gradle
+++ b/chimpchat/build.gradle
@@ -2,9 +2,9 @@ group = 'com.android.tools'
 archivesBaseName = 'chimpchat'
 
 dependencies {
-    compile project(':swt:hierarchyviewer2:hierarchyviewer2lib')
-    compile project(':sdklib')
-    compile project(':ddmlib')
+    compile project(':base:sdklib')
+    compile project(':base:ddmlib')
+    compile project(':swt:hierarchyviewer2lib')
 
     testCompile 'junit:junit:3.8.1'
 }
diff --git a/ddms/app/build.gradle b/ddms/app/build.gradle
index 14c1032..52dbb67 100644
--- a/ddms/app/build.gradle
+++ b/ddms/app/build.gradle
@@ -2,22 +2,22 @@ group = 'com.android.tools.ddms'
 archivesBaseName = 'ddms'
 
 dependencies {
-    compile project(':swt:ddms:ddmuilib')
+    compile project(':base:common')
+    compile project(':base:ddmlib')
+    compile project(':swt:ddmuilib')
     compile project(':swt:sdkstats')
     compile project(':swt:swtmenubar')
-    compile project(':common')
-    compile project(':ddmlib')
 }
 
 sdk {
     linux {
-       path('etc/ddms') { executable true }
+       item('etc/ddms') { executable true }
     }
     mac {
-       path('etc/ddms') { executable true }
+       item('etc/ddms') { executable true }
     }
     windows {
-       path 'etc/ddms.bat'
+       item 'etc/ddms.bat'
     }
 }
 
diff --git a/ddms/ddmuilib/build.gradle b/ddms/ddmuilib/build.gradle
index 4d4be8a..e41c8d6 100644
--- a/ddms/ddmuilib/build.gradle
+++ b/ddms/ddmuilib/build.gradle
@@ -2,7 +2,7 @@ group = 'com.android.tools.ddms'
 archivesBaseName = 'ddmuilib'
 
 dependencies {
-    compile project(':ddmlib')
+    compile project(':base:ddmlib')
     compile 'jfree:jfreechart:1.0.9'
     compile 'jfree:jfreechart-swt:1.0.9'
 
diff --git a/hierarchyviewer2/app/build.gradle b/hierarchyviewer2/app/build.gradle
index c5928ee..224af95 100644
--- a/hierarchyviewer2/app/build.gradle
+++ b/hierarchyviewer2/app/build.gradle
@@ -2,23 +2,23 @@ group = 'com.android.tools'
 archivesBaseName = 'hierarchyviewer2'
 
 dependencies {
-    compile project(':swt:ddms:ddmuilib')
-    compile project(':swt:hierarchyviewer2:hierarchyviewer2lib')
+    compile project(':base:common')
+    compile project(':base:sdklib')
+    compile project(':base:ddmlib')
+    compile project(':swt:ddmuilib')
+    compile project(':swt:hierarchyviewer2lib')
     compile project(':swt:swtmenubar')
-    compile project(':common')
-    compile project(':sdklib')
-    compile project(':ddmlib')
 }
 
 sdk {
     linux {
-       path('etc/hierarchyviewer')  { executable true }
+       item('etc/hierarchyviewer')  { executable true }
     }
     mac {
-       path('etc/hierarchyviewer')  { executable true }
+       item('etc/hierarchyviewer')  { executable true }
     }
     windows {
-       path 'etc/hierarchyviewer.bat'
+       item 'etc/hierarchyviewer.bat'
     }
 }
 
diff --git a/hierarchyviewer2/hierarchyviewer2lib/build.gradle b/hierarchyviewer2/hierarchyviewer2lib/build.gradle
index d014a28..d935be9 100644
--- a/hierarchyviewer2/hierarchyviewer2lib/build.gradle
+++ b/hierarchyviewer2/hierarchyviewer2lib/build.gradle
@@ -2,8 +2,9 @@ group = 'com.android.tools'
 archivesBaseName = 'hierarchyviewer2lib'
 
 dependencies {
-    compile project(':swt:ddms:ddmuilib')
-    compile project(':ddmlib')
+    compile project(':base:ddmlib')
+    compile project(':swt:ddmuilib')
+
     compile 'com.google.guava:guava:15.0'
 }
 
diff --git a/monkeyrunner/build.gradle b/monkeyrunner/build.gradle
index fe9a11b..a109d33 100644
--- a/monkeyrunner/build.gradle
+++ b/monkeyrunner/build.gradle
@@ -2,11 +2,11 @@ group = 'com.android.tools'
 archivesBaseName = 'monkeyrunner'
 
 dependencies {
+    compile project(':base:common')
+    compile project(':base:sdklib')
+    compile project(':base:ddmlib')
     compile project(':swt:chimpchat')
-    compile project(':swt:hierarchyviewer2:hierarchyviewer2lib')
-    compile project(':common')
-    compile project(':sdklib')
-    compile project(':ddmlib')
+    compile project(':swt:hierarchyviewer2lib')
 
     // Specific prebuilts and external libs used by mr.
     compile 'com.google.jsilver:jsilver:1.0.0'
@@ -22,13 +22,13 @@ sourceSets {
 
 sdk {
     linux {
-       path('etc/monkeyrunner')  { executable true }
+       item('etc/monkeyrunner')  { executable true }
     }
     mac {
-       path('etc/monkeyrunner')  { executable true }
+       item('etc/monkeyrunner')  { executable true }
     }
     windows {
-       path 'etc/monkeyrunner.bat'
+       item 'etc/monkeyrunner.bat'
     }
 }
 
diff --git a/sdkmanager/app/build.gradle b/sdkmanager/app/build.gradle
index b476709..d15fde9 100644
--- a/sdkmanager/app/build.gradle
+++ b/sdkmanager/app/build.gradle
@@ -2,23 +2,23 @@ group = 'com.android.tools'
 archivesBaseName = 'sdkmanager'
 
 dependencies {
-    compile project(':swt:sdkmanager:sdkuilib')
-    compile project(':common')
-    compile project(':sdklib')
+    compile project(':base:common')
+    compile project(':base:sdklib')
+    compile project(':swt:sdkuilib')
 
-    testCompile project(':sdklib-test')
+    testCompile project(':base:sdklib-test')
     testCompile 'junit:junit:3.8.1'
 }
 
 sdk {
     linux {
-       path('etc/android')  { executable true }
+       item('etc/android')  { executable true }
     }
     mac {
-       path('etc/android')  { executable true }
+       item('etc/android')  { executable true }
     }
     windows {
-       path 'etc/android.bat'
+       item 'etc/android.bat'
     }
 }
 
diff --git a/sdkmanager/sdkuilib/build.gradle b/sdkmanager/sdkuilib/build.gradle
index 413f2d6..92eb4b7 100644
--- a/sdkmanager/sdkuilib/build.gradle
+++ b/sdkmanager/sdkuilib/build.gradle
@@ -2,10 +2,10 @@ group = 'com.android.tools'
 archivesBaseName = 'sdkuilib'
 
 dependencies {
+    compile project(':base:sdklib')
     compile project(':swt:swtmenubar')
-    compile project(':sdklib')
 
-    testCompile project(':sdklib-test')
+    testCompile project(':base:sdklib-test')
     testCompile 'junit:junit:3.8.1'
 }
 
diff --git a/sdkstats/build.gradle b/sdkstats/build.gradle
index 128c288..c72a79c 100644
--- a/sdkstats/build.gradle
+++ b/sdkstats/build.gradle
@@ -2,8 +2,8 @@ group = 'com.android.tools'
 archivesBaseName = 'sdkstats'
 
 dependencies {
+    compile project(':base:common')
     compile project(':swt:swtmenubar')
-    compile project(':common')
 
     testCompile 'junit:junit:3.8.1'
 }
diff --git a/swtmenubar/build.gradle b/swtmenubar/build.gradle
index fb69102..1c10978 100644
--- a/swtmenubar/build.gradle
+++ b/swtmenubar/build.gradle
@@ -2,7 +2,7 @@ group = 'com.android.tools'
 archivesBaseName = 'swtmenubar'
 
 dependencies {
-    compile project(':sdklib')
+    compile project(':base:sdklib')
 
     testCompile 'junit:junit:3.8.1'
 }
diff --git a/traceview/build.gradle b/traceview/build.gradle
index 7db4794..2706d76 100644
--- a/traceview/build.gradle
+++ b/traceview/build.gradle
@@ -2,19 +2,19 @@ group = 'com.android.tools'
 archivesBaseName = 'traceview'
 
 dependencies {
+    compile project(':base:common')
     compile project(':swt:sdkstats')
-    compile project(':common')
 }
 
 sdk {
     linux {
-       path('etc/traceview')  { executable true }
+       item('etc/traceview')  { executable true }
     }
     mac {
-       path('etc/traceview')  { executable true }
+       item('etc/traceview')  { executable true }
     }
     windows {
-       path 'etc/traceview.bat'
+       item 'etc/traceview.bat'
     }
 }
 
diff --git a/uiautomatorviewer/build.gradle b/uiautomatorviewer/build.gradle
index 759886e..4c5abd8 100644
--- a/uiautomatorviewer/build.gradle
+++ b/uiautomatorviewer/build.gradle
@@ -2,7 +2,7 @@ group = 'com.android.tools'
 archivesBaseName = 'uiautomatorviewer'
 
 dependencies {
-    compile project(':ddmlib')
+    compile project(':base:ddmlib')
 }
 
 sourceSets {
@@ -11,13 +11,13 @@ sourceSets {
 
 sdk {
     linux {
-       path('etc/uiautomatorviewer')  { executable true }
+       item('etc/uiautomatorviewer')  { executable true }
     }
     mac {
-       path('etc/uiautomatorviewer')  { executable true }
+       item('etc/uiautomatorviewer')  { executable true }
     }
     windows {
-       path 'etc/uiautomatorviewer.bat'
+       item 'etc/uiautomatorviewer.bat'
     }
 }