diff options
author | Xavier Ducrohet <xav@google.com> | 2014-06-12 22:50:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2014-06-12 22:50:06 +0000 |
commit | 2991e0207feb0c73e6ca7e635457629b3331308f (patch) | |
tree | 2333f688876656084c956ff86e5071c5901149ba /emulator | |
parent | bbd3db1836a68b4ab02205682ac30cd6cec59be4 (diff) | |
parent | a6e9f7b2fc87932fdb0bf23c12b6ceb8c7d832eb (diff) | |
download | sdk-2991e0207feb0c73e6ca7e635457629b3331308f.zip sdk-2991e0207feb0c73e6ca7e635457629b3331308f.tar.gz sdk-2991e0207feb0c73e6ca7e635457629b3331308f.tar.bz2 |
Merge "Move to custom plugin for native setup." into idea133
automerge: a6e9f7b
* commit 'a6e9f7b2fc87932fdb0bf23c12b6ceb8c7d832eb':
Move to custom plugin for native setup.
Diffstat (limited to 'emulator')
-rw-r--r-- | emulator/mksdcard/build.gradle | 67 |
1 files changed, 1 insertions, 66 deletions
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle index 53872a3..f993aa1 100644 --- a/emulator/mksdcard/build.gradle +++ b/emulator/mksdcard/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'c' apply plugin: 'sdk-files' +apply plugin: 'native-setup' executables { mksdcard {} @@ -16,38 +17,6 @@ sources { } } -model { - platforms { - linux { - architecture "i386" - operatingSystem "linux" - } - darwin { - architecture "i386" - operatingSystem "osx" - } - windows { - architecture "i386" - operatingSystem "windows" - } - } - - toolChains { - host(Clang) - mingw(Gcc) { - path "$project.rootDir/../prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/bin" - - addPlatformConfiguration(new MingwOnLinuxConfiguration()) - - getCCompiler().executable = 'x86_64-w64-mingw32-gcc' - getCppCompiler().executable = 'x86_64-w64-mingw32-g++' - getLinker().executable = 'x86_64-w64-mingw32-gcc' - getAssembler().executable = 'x86_64-w64-mingw32-as' - getStaticLibArchiver().executable = 'x86_64-w64-mingw32-ar' - } - } -} - sdk { mac { item( { getExeName("darwin") } ) { @@ -76,37 +45,3 @@ def getExeName(String platform) { return binaries.executableFile.get(0) } -class MingwOnLinuxConfiguration implements TargetPlatformConfiguration { - - boolean supportsPlatform(Platform element) { - return element.getOperatingSystem().name == "windows" - } - - List<String> getCppCompilerArgs() { - [] - } - - List<String> getCCompilerArgs() { - ['-DUSE_MINGW', '-D__STDC_FORMAT_MACROS', '-D__STDC_CONSTANT_MACROS', '-D__USE_MINGW_ANSI_STDIO', '-m32'] - } - - List<String> getObjectiveCCompilerArgs() { - [] - } - - List<String> getObjectiveCppCompilerArgs() { - [] - } - - List<String> getAssemblerArgs() { - [] - } - - List<String> getLinkerArgs() { - ['-m32'] - } - - List<String> getStaticLibraryArchiverArgs() { - [] - } -} |