aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2017-07-11 14:09:34 -0700
committer[O <jansene@google.com>2017-07-11 14:38:20 -0700
commite0f2bd9bf6894fbc3e29301b80146cd88a79e398 (patch)
tree1d643ae8ca8c7808e93864047e0674d666112a36
parent6e44587971369305c940ed7d243c167189640c2a (diff)
downloadbuildSrc-e0f2bd9bf6894fbc3e29301b80146cd88a79e398.tar.gz
[emulator] Produce 64-Bit darwin & linux binaries.emu-gn-devemu-2.8-releaseemu-2.7-releaseemu-2.6-releaseemu-2.5-release
- We now target x64 vs i386 since we no longer support i386. This fixes some issues users are seeing around 32-bit binaries. Change-Id: I7b71107b792b2f04eeebd8cdd2230885931a9578 Bug: b/37132646 Test: file mksdcard => mksdcard: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) Test: file mksdcard => mksdcard: Mach-O 64-bit executable x86_64
-rw-r--r--src/main/groovy/com/android/tools/internal/nativesetup/NativeSetupPlugin.groovy4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/groovy/com/android/tools/internal/nativesetup/NativeSetupPlugin.groovy b/src/main/groovy/com/android/tools/internal/nativesetup/NativeSetupPlugin.groovy
index 2c5dd04..0b0ea79 100644
--- a/src/main/groovy/com/android/tools/internal/nativesetup/NativeSetupPlugin.groovy
+++ b/src/main/groovy/com/android/tools/internal/nativesetup/NativeSetupPlugin.groovy
@@ -31,11 +31,11 @@ class NativeSetupPlugin implements Plugin<Project> {
project.model {
platforms {
linux {
- architecture "i386"
+ architecture "x86_64"
operatingSystem "linux"
}
darwin {
- architecture "i386"
+ architecture "x86_64"
operatingSystem "osx"
}
}