aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingfeng Yang <lfy@google.com>2018-07-02 09:41:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-02 09:41:09 -0700
commit7fabb508f94438bef8bd85041490d4d1a143fd39 (patch)
treea02a84f28530ec3b2c5041c125b2f22a3f77dec4
parentabd24e26031666d6a3415b8971ba6b2062cf89f4 (diff)
parent21b5f6fef124e14b612b506620ea5c8addde0536 (diff)
downloadsdk-7fabb508f94438bef8bd85041490d4d1a143fd39.tar.gz
Merge "Add -static-libgcc to mksdcard on Windows"temp_p_merge
am: 21b5f6fef1 Change-Id: Ie4c54feb2d79a529d3df231bdc6c0f725981db56
-rw-r--r--emulator/mksdcard/build.gradle3
1 files changed, 3 insertions, 0 deletions
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle
index 677f763e4..f2bbe733c 100644
--- a/emulator/mksdcard/build.gradle
+++ b/emulator/mksdcard/build.gradle
@@ -19,6 +19,9 @@ sources {
binaries.all {
cCompiler.args "-D_FILE_OFFSET_BITS=64"
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+ linker.args "-static-libgcc"
+ }
}
sdk {