diff options
| author | Siva Velusamy <vsiva@google.com> | 2015-03-20 22:17:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:17:04 +0000 |
| commit | 6809c4484af80640c3f4dbb80a71b3a92ea2853a (patch) | |
| tree | a094f432b1549548515027e83ff8faeb73864a76 | |
| parent | 4c13b4eb0ccac376689aedd558932c1fa0c7fd6c (diff) | |
| parent | eea061e4bee17ed9207f50d427a8c9ec4792d3f8 (diff) | |
| download | sdk-6809c4484af80640c3f4dbb80a71b3a92ea2853a.zip sdk-6809c4484af80640c3f4dbb80a71b3a92ea2853a.tar.gz sdk-6809c4484af80640c3f4dbb80a71b3a92ea2853a.tar.bz2 | |
am eea061e4: am ec58e2e9: Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133 automerge: f68260f
* commit 'eea061e4bee17ed9207f50d427a8c9ec4792d3f8':
monitor: Move from sdk/ to sdk/eclipse
| -rw-r--r-- | eclipse/monitor/build.gradle (renamed from monitor/build.gradle) | 5 | ||||
| -rwxr-xr-x | eclipse/monitor/monitor (renamed from monitor/monitor) | 0 | ||||
| -rwxr-xr-x | eclipse/monitor/monitor.bat (renamed from monitor/monitor.bat) | 0 | ||||
| -rwxr-xr-x | eclipse/scripts/update_version.sh | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/monitor/build.gradle b/eclipse/monitor/build.gradle index 211ca0c..03cd8fd 100644 --- a/monitor/build.gradle +++ b/eclipse/monitor/build.gradle @@ -1,9 +1,6 @@ apply plugin: 'sdk-files' -// See $ANDROID_SRC/tools/buildSrc/base/version.gradle for definition of baseVersion -// However, if Eclipse bundles don't get the same version as tools baseVersion, then this -// will have to be hard coded and fixed by sdk/eclipse/scripts/update_version.sh -def basePath = "../../out/host/maven/bundles-${rootProject.ext.baseVersion}-SNAPSHOT/products/" +def basePath = "../../../out/host/maven/bundles-23.0.3-SNAPSHOT/products/" sdk { linux { diff --git a/monitor/monitor b/eclipse/monitor/monitor index 53a2bb5..53a2bb5 100755 --- a/monitor/monitor +++ b/eclipse/monitor/monitor diff --git a/monitor/monitor.bat b/eclipse/monitor/monitor.bat index aab18ae..aab18ae 100755 --- a/monitor/monitor.bat +++ b/eclipse/monitor/monitor.bat diff --git a/eclipse/scripts/update_version.sh b/eclipse/scripts/update_version.sh index d3b71b1..228be97 100755 --- a/eclipse/scripts/update_version.sh +++ b/eclipse/scripts/update_version.sh @@ -56,6 +56,7 @@ done SED_OLD="${OLD//./\.}" SED_NEW="${NEW//./\.}" for i in artifacts/*/pom.xml \ + monitor/build.gradle \ plugins/com.android.ide.eclipse.adt.package/ide.product \ plugins/com.android.ide.eclipse.monitor/monitor.product \ plugins/com.android.ide.eclipse.monitor/plugin.properties \ |