diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-11-14 08:32:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-14 08:32:26 +0000 |
| commit | 6ea3614f82922dbd32aae5ef94a873557d7e7747 (patch) | |
| tree | bdb0db8b1c57cb14f05e0946199991928159653b /emulator | |
| parent | df61c5547ee620a1ca2c7686971c40d744e4359a (diff) | |
| parent | 7ffcc2bd1248a25c221e3f2957cc54678e0473b9 (diff) | |
| download | sdk-6ea3614f82922dbd32aae5ef94a873557d7e7747.zip sdk-6ea3614f82922dbd32aae5ef94a873557d7e7747.tar.gz sdk-6ea3614f82922dbd32aae5ef94a873557d7e7747.tar.bz2 | |
Merge "Build and package 32/64bit find_java." into studio-1.0-dev automerge: 7e91a74
automerge: 7ffcc2b
* commit '7ffcc2bd1248a25c221e3f2957cc54678e0473b9':
Build and package 32/64bit find_java.
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/mksdcard/build.gradle | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle index adb731a..677f763 100644 --- a/emulator/mksdcard/build.gradle +++ b/emulator/mksdcard/build.gradle @@ -35,9 +35,9 @@ sdk { } } windows { - item( { getExeName("windows") } ) { + item( { getExeName("windows32") } ) { name 'mksdcard.exe' - builtBy 'windowsMksdcardExecutable' + builtBy 'windows32MksdcardExecutable' } } } |