summaryrefslogtreecommitdiff
path: root/ddms
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2014-01-15 13:47:45 -0800
committerXavier Ducrohet <xav@google.com>2014-05-08 09:55:25 -0700
commit570793541fe79d192c6ecab41fb5dcf574d43b80 (patch)
treed6b4f56e83d2f4310baeac4c3b67cac4e86a9ebb /ddms
parentcb5f689742638cffd1c40a3e63bcd8f29393d48c (diff)
downloadswt-570793541fe79d192c6ecab41fb5dcf574d43b80.tar.gz
Update build files to build from tools/
Change-Id: I06c7fb0464f4f5f01fd9856a2e6851b956ddc126
Diffstat (limited to 'ddms')
-rw-r--r--ddms/app/build.gradle13
-rw-r--r--ddms/ddmuilib/build.gradle5
2 files changed, 6 insertions, 12 deletions
diff --git a/ddms/app/build.gradle b/ddms/app/build.gradle
index a07e3bd..8f158a1 100644
--- a/ddms/app/build.gradle
+++ b/ddms/app/build.gradle
@@ -2,20 +2,17 @@ group = 'com.android.tools.ddms'
archivesBaseName = 'ddms'
dependencies {
- compile project(':ddmuilib')
- compile project(':sdkstats')
- compile project(':swtmenubar')
- compile "com.android.tools:common:$version"
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':swt:ddms:ddmuilib')
+ compile project(':swt:sdkstats')
+ compile project(':swt:swtmenubar')
+ compile project(':common')
+ compile project(':ddmlib')
}
shipping {
launcherScripts = ['etc/ddms', 'etc/ddms.bat']
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
// configure the manifest of the buildDistributionJar task.
buildDistributionJar.manifest.attributes("Main-Class": "com.android.ddms.Main")
diff --git a/ddms/ddmuilib/build.gradle b/ddms/ddmuilib/build.gradle
index a5d1752..4d4be8a 100644
--- a/ddms/ddmuilib/build.gradle
+++ b/ddms/ddmuilib/build.gradle
@@ -2,16 +2,13 @@ group = 'com.android.tools.ddms'
archivesBaseName = 'ddmuilib'
dependencies {
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':ddmlib')
compile 'jfree:jfreechart:1.0.9'
compile 'jfree:jfreechart-swt:1.0.9'
testCompile 'junit:junit:3.8.1'
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
sourceSets {
main.resources.srcDir 'src/main/java'
test.resources.srcDir 'src/test/java'