diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-11-14 03:39:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-14 03:39:45 +0000 |
| commit | 7ffcc2bd1248a25c221e3f2957cc54678e0473b9 (patch) | |
| tree | 8c266a3e5a3098d4a2f4db9e9a5eb03ab02dd2a5 /emulator | |
| parent | f87f73f11e50e3669519201b15af5f30bfebc036 (diff) | |
| parent | 7e91a740cb092a020c1bb6e99982e162741ffd61 (diff) | |
| download | sdk-7ffcc2bd1248a25c221e3f2957cc54678e0473b9.tar.gz sdk-7ffcc2bd1248a25c221e3f2957cc54678e0473b9.tar.bz2 sdk-7ffcc2bd1248a25c221e3f2957cc54678e0473b9.zip | |
Merge "Build and package 32/64bit find_java." into studio-1.0-dev
automerge: 7e91a74
* commit '7e91a740cb092a020c1bb6e99982e162741ffd61':
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 adb731a1d..677f763e4 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' } } } |