diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-06-19 00:00:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-06-19 00:00:08 +0000 |
| commit | 064ccc8bc84ef6a59f06e1c1c6d14422bcc00eaf (patch) | |
| tree | 6eddc7a7cc6b1f1a1aa01cd12d118501453a8fb0 /eclipse/scripts | |
| parent | aaecc136296eb992f1ad5a6b099b5b8d8a8eda3a (diff) | |
| parent | e85249977173a9d32f87502ba374b05be29629a7 (diff) | |
| download | sdk-064ccc8bc84ef6a59f06e1c1c6d14422bcc00eaf.zip sdk-064ccc8bc84ef6a59f06e1c1c6d14422bcc00eaf.tar.gz sdk-064ccc8bc84ef6a59f06e1c1c6d14422bcc00eaf.tar.bz2 | |
Merge "Fix packagign of sdk launcher exe on win." into idea133
automerge: e852499
* commit 'e85249977173a9d32f87502ba374b05be29629a7':
Fix packagign of sdk launcher exe on win.
Make zipAlignExe come from Build-tools
Add monitor to sdk build
Update ADT plugins/features version to 23.0.0
Update Tools package revision to 23.0.0
Diffstat (limited to 'eclipse/scripts')
| -rwxr-xr-x | eclipse/scripts/build_adt.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/eclipse/scripts/build_adt.sh b/eclipse/scripts/build_adt.sh index be773ea..7006aab 100755 --- a/eclipse/scripts/build_adt.sh +++ b/eclipse/scripts/build_adt.sh @@ -19,8 +19,6 @@ PROG_DIR=$(dirname "$0") cd "$PROG_DIR"/../../.. ANDROID_SRC="$PWD" -MAVEN="$ANDROID_SRC"/prebuilts/eclipse/maven/apache-maven-3.2.1/bin/mvn - OUT="$1" DIST="$2" BNUM="$3" |