Update build files to build from tools/
Change-Id: I06c7fb0464f4f5f01fd9856a2e6851b956ddc126
diff --git a/build.gradle b/build.gradle
index 47b0fec..bf92399 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,65 +1,9 @@
-buildscript {
- repositories {
- maven { url "$rootDir/../../prebuilts/tools/common/gradle-plugins/repository" }
- }
- dependencies {
- classpath 'com.android.tools.internal:internal-plugins:1.1'
- }
-}
-
-apply plugin: 'clone-artifacts'
-apply plugin: 'distrib'
-
-// artifact cloning destinations
-cloneArtifacts {
- mainRepo = "$rootDir/../../prebuilts/tools/common/m2/repository"
- secondaryRepo = "$rootDir/../../prebuilts/tools/common/m2/internal"
-}
-// set up the distribution destination
-distribution {
- destinationPath = "$rootDir/../../prebuilts/devtools"
- dependenciesRepo = cloneArtifacts.mainRepo
-}
-
-// ext.androidHostOut is shared by all tools/{base,build,swt} gradle projects/
-ext.androidHostOut = file("$rootDir/../../out/host/gradle")
-ext.androidRootDir = file(new File(ext.androidHostOut, "../../../"))
-// rootProject.buildDir is specific to this gradle build.
-buildDir = new File(file(ext.androidHostOut), "tools/swt/build")
-
-def getVersion(Project p, String baseVersion) {
- if (p.has("release")) {
- return baseVersion
- }
-
- return baseVersion + '-SNAPSHOT'
-}
-
+// this applied only to swt/* projects
subprojects { Project project ->
- // Change buildDir first so that all plugins pick up the new value.
- project.buildDir = project.file("$project.parent.buildDir/../$project.name")
+ // only configure leaf projects.
+ if (!project.getSubprojects().isEmpty()) return
- apply plugin: 'java'
- apply plugin: 'maven'
- apply plugin: 'findbugs'
apply plugin: 'distrib'
- apply plugin: 'clone-artifacts'
-
- repositories {
- maven { url = uri(rootProject.cloneArtifacts.mainRepo) }
- maven { url = uri(rootProject.cloneArtifacts.secondaryRepo) }
- maven { url = uri("$rootProject.ext.androidHostOut/repo") }
- }
-
- // find bug dependencies is added dynamically so it's hard for the
- // clone artifact plugin to find it. This custom config lets us manually
- // add such dependencies.
- configurations {
- hidden
- }
- dependencies {
- hidden "com.google.code.findbugs:findbugs:2.0.1"
- }
// configuration for swt dependency since the packaged jar is platform dependent
// but at compile time we don't care. Also we don't want the artifact in the
@@ -76,50 +20,4 @@
// include swt for compilation
sourceSets.main.compileClasspath += configurations.swt
-
- ext.baseVersion = '22.8.0'
-
- version = getVersion(project, ext.baseVersion)
-
- // set all java compilation to use UTF-8 encoding.
- tasks.withType(JavaCompile) {
- options.encoding = 'UTF-8'
- }
-
- task disableTestFailures << {
- tasks.withType(Test) {
- ignoreFailures = true
- }
- }
-
- // add javadoc/source jar tasks as artifacts
- artifacts {
- archives jar
- }
-
- task publishLocal(type: Upload) {
- configuration = configurations.archives
- repositories {
- mavenDeployer {
- repository(url: uri("$rootProject.ext.androidHostOut/repo"))
- }
- }
- }
-
- findbugs {
- ignoreFailures = true
- effort = "max"
- reportLevel = "high"
- }
-
-}
-
-// delay evaluation of this project before all subprojects have been evaluated.
-subprojects.each { subproject -> evaluationDependsOn(subproject.path) }
-
-def testTasks = subprojects.collect { it.tasks.withType(Test) }.flatten()
-
-task aggregateResults(type: Copy) {
- from { testTasks*.testResultsDir }
- into { file("$buildDir/results") }
}
diff --git a/chimpchat/build.gradle b/chimpchat/build.gradle
index 380723a..18cca50 100644
--- a/chimpchat/build.gradle
+++ b/chimpchat/build.gradle
@@ -2,13 +2,11 @@
archivesBaseName = 'chimpchat'
dependencies {
- compile project(':hierarchyviewer2lib')
- compile "com.android.tools:sdklib:$version"
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':swt:hierarchyviewer2:hierarchyviewer2lib')
+ compile project(':sdklib')
+ compile project(':ddmlib')
testCompile 'junit:junit:3.8.1'
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
+apply from: "$rootDir/buildSrc/base/baseVersion.gradle"
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 @@
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 @@
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'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7b359d7..0000000
--- a/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index d8dba3e..0000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Dec 12 15:16:42 PST 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=../../../external/gradle/gradle-1.11-bin.zip
diff --git a/gradlew b/gradlew
deleted file mode 100755
index 66b0fde..0000000
--- a/gradlew
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/"
-APP_HOME="`pwd -P`"
-cd "$SAVED"
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-# Change the project's .gradle to the android out dir.
-ANDROID_GRADLE_ROOT="$APP_HOME/../../out/host/gradle/tools/swt"
-if [[ -z "$ANDROID_CACHE_DIR" ]]; then
- ANDROID_CACHE_DIR="$ANDROID_GRADLE_ROOT/.gradle"
-fi
-
-# Change the local user directories to be under the android out dir
-export GRADLE_USER_HOME="$ANDROID_GRADLE_ROOT/.gradle"
-export M2_HOME="$ANDROID_GRADLE_ROOT/.m2"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
- --project-cache-dir=$ANDROID_CACHE_DIR \
- "$@"
-
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 77be707..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,96 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Change the project's .gradle to the android out dir.
-set ANDROID_GRADLE_ROOT=%APP_HOME%\..\..\out\host\gradle\tools\swt
-set ANDROID_CACHE_DIR=%ANDROID_GRADLE_ROOT%\.gradle
-set GRADLE_USER_HOME=%ANDROID_GRADLE_ROOT%\.gradle
-set M2_HOME=%ANDROID_GRADLE_ROOT%\.m2
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% --project-cache-dir=%ANDROID_CACHE_DIR%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/hierarchyviewer2/app/build.gradle b/hierarchyviewer2/app/build.gradle
index ad4b3b3..86b152c 100644
--- a/hierarchyviewer2/app/build.gradle
+++ b/hierarchyviewer2/app/build.gradle
@@ -2,12 +2,12 @@
archivesBaseName = 'hierarchyviewer2'
dependencies {
- compile project(':ddmuilib')
- compile project(':hierarchyviewer2lib')
- compile project(':swtmenubar')
- compile "com.android.tools:common:$version"
- compile "com.android.tools:sdklib:$version"
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':swt:ddms:ddmuilib')
+ compile project(':swt:hierarchyviewer2:hierarchyviewer2lib')
+ compile project(':swt:swtmenubar')
+ compile project(':common')
+ compile project(':sdklib')
+ compile project(':ddmlib')
}
shipping {
diff --git a/hierarchyviewer2/hierarchyviewer2lib/build.gradle b/hierarchyviewer2/hierarchyviewer2lib/build.gradle
index 1281ed6..d014a28 100644
--- a/hierarchyviewer2/hierarchyviewer2lib/build.gradle
+++ b/hierarchyviewer2/hierarchyviewer2lib/build.gradle
@@ -2,15 +2,11 @@
archivesBaseName = 'hierarchyviewer2lib'
dependencies {
- compile project(':ddmuilib')
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':swt:ddms:ddmuilib')
+ compile project(':ddmlib')
compile 'com.google.guava:guava:15.0'
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
-
sourceSets {
main.resources.srcDir 'src/main/java'
test.resources.srcDir 'src/test/java'
diff --git a/monkeyrunner/build.gradle b/monkeyrunner/build.gradle
index 5b3d514..a9a9ac4 100644
--- a/monkeyrunner/build.gradle
+++ b/monkeyrunner/build.gradle
@@ -2,11 +2,11 @@
archivesBaseName = 'monkeyrunner'
dependencies {
- compile project(':chimpchat')
- compile project(':hierarchyviewer2lib')
- compile "com.android.tools:common:$version"
- compile "com.android.tools:sdklib:$version"
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':swt:chimpchat')
+ compile project(':swt:hierarchyviewer2:hierarchyviewer2lib')
+ compile project(':common')
+ compile project(':sdklib')
+ compile project(':ddmlib')
// Specific prebuilts and external libs used by mr.
compile 'com.google.jsilver:jsilver:1.0.0'
@@ -27,9 +27,6 @@
]
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
// configure the manifest of the buildDistributionJar task.
buildDistributionJar.manifest.attributes("Main-Class": "com.android.monkeyrunner.MonkeyRunnerStarter")
diff --git a/sdkmanager/app/build.gradle b/sdkmanager/app/build.gradle
index 018dc9d..d98824c 100644
--- a/sdkmanager/app/build.gradle
+++ b/sdkmanager/app/build.gradle
@@ -2,11 +2,11 @@
archivesBaseName = 'sdkmanager'
dependencies {
- compile project(':sdkuilib')
- compile "com.android.tools:common:$version"
- compile "com.android.tools:sdklib:$version"
+ compile project(':swt:sdkmanager:sdkuilib')
+ compile project(':common')
+ compile project(':sdklib')
- testCompile "com.android.tools:sdklib-test:$version"
+ testCompile project(':sdklib-test')
testCompile 'junit:junit:3.8.1'
}
@@ -14,9 +14,6 @@
launcherScripts = ['etc/android', 'etc/android.bat']
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
// configure the manifest of the buildDistributionJar task.
buildDistributionJar.manifest.attributes("Main-Class": "com.android.sdkmanager.Main")
diff --git a/sdkmanager/sdkuilib/build.gradle b/sdkmanager/sdkuilib/build.gradle
index d77e81f..413f2d6 100644
--- a/sdkmanager/sdkuilib/build.gradle
+++ b/sdkmanager/sdkuilib/build.gradle
@@ -2,10 +2,10 @@
archivesBaseName = 'sdkuilib'
dependencies {
- compile project(':swtmenubar')
- compile "com.android.tools:sdklib:$version"
+ compile project(':swt:swtmenubar')
+ compile project(':sdklib')
- testCompile "com.android.tools:sdklib-test:$version"
+ testCompile project(':sdklib-test')
testCompile 'junit:junit:3.8.1'
}
diff --git a/sdkstats/build.gradle b/sdkstats/build.gradle
index 9347ae5..128c288 100644
--- a/sdkstats/build.gradle
+++ b/sdkstats/build.gradle
@@ -2,8 +2,8 @@
archivesBaseName = 'sdkstats'
dependencies {
- compile project(':swtmenubar')
- compile "com.android.tools:common:$version"
+ compile project(':swt:swtmenubar')
+ compile project(':common')
testCompile 'junit:junit:3.8.1'
}
@@ -13,6 +13,3 @@
test.resources.srcDir 'src/test/java'
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index c24aebf..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-include "chimpchat"
-include "ddms"
-include "ddmuilib"
-include "hierarchyviewer2"
-include "hierarchyviewer2lib"
-include "monkeyrunner"
-include "sdkmanager"
-include "sdkstats"
-include "sdkuilib"
-include "swtmenubar"
-include "traceview"
-include "uiautomatorviewer"
-
-project(':ddms' ).projectDir = new File(rootDir, 'ddms/app')
-project(':ddmuilib').projectDir = new File(rootDir, 'ddms/ddmuilib')
-project(':hierarchyviewer2' ).projectDir = new File(rootDir, 'hierarchyviewer2/app')
-project(':hierarchyviewer2lib').projectDir = new File(rootDir, 'hierarchyviewer2/hierarchyviewer2lib')
-project(':sdkmanager').projectDir = new File(rootDir, 'sdkmanager/app')
-project(':sdkuilib' ).projectDir = new File(rootDir, 'sdkmanager/sdkuilib')
-
diff --git a/swtmenubar/build.gradle b/swtmenubar/build.gradle
index 2cddb5d..fb69102 100644
--- a/swtmenubar/build.gradle
+++ b/swtmenubar/build.gradle
@@ -2,8 +2,7 @@
archivesBaseName = 'swtmenubar'
dependencies {
- compile "com.android.tools:sdklib:$version"
- compile 'com.android.external.eclipse:org-eclipse-jface:3.6.2'
+ compile project(':sdklib')
testCompile 'junit:junit:3.8.1'
}
diff --git a/traceview/build.gradle b/traceview/build.gradle
index fd00d11..67fd191 100644
--- a/traceview/build.gradle
+++ b/traceview/build.gradle
@@ -2,17 +2,14 @@
archivesBaseName = 'traceview'
dependencies {
- compile project(':sdkstats')
- compile "com.android.tools:common:$version"
+ compile project(':swt:sdkstats')
+ compile project(':common')
}
shipping {
launcherScripts = ['etc/traceview', 'etc/traceview.bat']
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
// configure the manifest of the buildDistributionJar task.
buildDistributionJar.manifest.attributes("Main-Class": "com.android.traceview.MainWindow")
diff --git a/uiautomatorviewer/build.gradle b/uiautomatorviewer/build.gradle
index d1a9009..faaffa0 100644
--- a/uiautomatorviewer/build.gradle
+++ b/uiautomatorviewer/build.gradle
@@ -2,16 +2,13 @@
archivesBaseName = 'uiautomatorviewer'
dependencies {
- compile "com.android.tools.ddms:ddmlib:$version"
+ compile project(':ddmlib')
}
shipping {
launcherScripts = ['etc/uiautomatorviewer', 'etc/uiautomatorviewer.bat']
}
-// include swt for compilation
-sourceSets.main.compileClasspath += configurations.swt
-
// configure the manifest of the buildDistributionJar task.
buildDistributionJar.manifest.attributes("Main-Class": "com.android.uiautomator.UiAutomatorViewer")