Roll Fuchsia SDK from 99f42fc7925d to e237df60615b

The AutoRoll server is located here: https://fuchsia-sdk-chromium-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio Change-Id: I0ff88b708c490cc760902e245e6473e90546c4b9 Reviewed-on: https://chromium-review.googlesource.com/1137750 Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Leon Scroggins <scroggo@chromium.org> Reviewed-by: Wez <wez@chromium.org> Reviewed-by: Fuchsia SDK Autoroller <fuchsia-sdk-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Commit-Queue: Wez <wez@chromium.org> Cr-Commit-Position: refs/heads/master@{#575870}
qweri0p · Jul 18, 2018 · cf06d02 · cf06d02
1 parent 5c054be
commit cf06d02
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/base/files/file.h b/base/files/file.h
@@ -25,9 +25,9 @@
 namespace base {
 
 #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \
-    defined(OS_ANDROID) && __ANDROID_API__ < 21
+  defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
 typedef struct stat stat_wrapper_t;
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#elif defined(OS_POSIX)
 typedef struct stat64 stat_wrapper_t;
 #endif
 
@@ -379,4 +379,3 @@ class BASE_EXPORT File {
 }  // namespace base
 
 #endif  // BASE_FILES_FILE_H_
-
diff --git a/base/files/file_posix.cc b/base/files/file_posix.cc
@@ -31,7 +31,7 @@ static_assert(File::FROM_BEGIN == SEEK_SET && File::FROM_CURRENT == SEEK_CUR &&
 namespace {
 
 #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \
-    defined(OS_ANDROID) && __ANDROID_API__ < 21
+  defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
 int CallFstat(int fd, stat_wrapper_t *sb) {
   AssertBlockingAllowed();
   return fstat(fd, sb);

diff --git a/base/files/file_util_posix.cc b/base/files/file_util_posix.cc
@@ -69,7 +69,7 @@ namespace base {
 namespace {
 
 #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL) || \
-    defined(OS_ANDROID) && __ANDROID_API__ < 21
+  defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
 int CallStat(const char* path, stat_wrapper_t* sb) {
   AssertBlockingAllowed();
   return stat(path, sb);

diff --git a/build/fuchsia/sdk.sha1 b/build/fuchsia/sdk.sha1
@@ -1 +1 @@
-99f42fc7925dbac59c5ddfe2b6edf9ec4c71df1e
+e237df60615b92cc90bdcd1aa3007d2cc83dc35c
diff --git a/third_party/fuchsia-sdk/BUILD.gn b/third_party/fuchsia-sdk/BUILD.gn
@@ -220,11 +220,8 @@ fuchsia_sdk_fidl_pkg("media") {
     "audio.fidl",
     "audio_capturer.fidl",
     "audio_renderer.fidl",
-    "media_result.fidl",
     "media_transport.fidl",
     "media_types.fidl",
-    "timeline_controller.fidl",
-    "timelines.fidl",
   ]
 }
 

diff --git a/third_party/zlib/contrib/minizip/ioapi.c b/third_party/zlib/contrib/minizip/ioapi.c
@@ -14,7 +14,7 @@
         #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
+#if defined(__APPLE__) || defined(__Fuchsia__) || defined(IOAPI_NO_64)
 // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
 #define FTELLO_FUNC(stream) ftello(stream)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		99f42fc7925dbac59c5ddfe2b6edf9ec4c71df1e
		e237df60615b92cc90bdcd1aa3007d2cc83dc35c