Commit 1dd9c248 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Migrate to OS_MAC and OS_APPLE in gin

Bug: 1105907
Change-Id: I7faf7a050da0babae655d4da9841fd5c0088ee17
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2325095Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792717}
parent ce335063
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#if defined(V8_USE_EXTERNAL_STARTUP_DATA) #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
#include "base/android/apk_assets.h" #include "base/android/apk_assets.h"
#elif defined(OS_MACOSX) #elif defined(OS_MAC)
#include "base/mac/foundation_util.h" #include "base/mac/foundation_util.h"
#endif #endif
#endif // V8_USE_EXTERNAL_STARTUP_DATA #endif // V8_USE_EXTERNAL_STARTUP_DATA
...@@ -97,7 +97,7 @@ void GetV8FilePath(const char* file_name, base::FilePath* path_out) { ...@@ -97,7 +97,7 @@ void GetV8FilePath(const char* file_name, base::FilePath* path_out) {
// This is the path within the .apk. // This is the path within the .apk.
*path_out = *path_out =
base::FilePath(FILE_PATH_LITERAL("assets")).AppendASCII(file_name); base::FilePath(FILE_PATH_LITERAL("assets")).AppendASCII(file_name);
#elif defined(OS_MACOSX) #elif defined(OS_MAC)
base::ScopedCFTypeRef<CFStringRef> bundle_resource( base::ScopedCFTypeRef<CFStringRef> bundle_resource(
base::SysUTF8ToCFStringRef(file_name)); base::SysUTF8ToCFStringRef(file_name));
*path_out = base::mac::PathForFrameworkBundleResource(bundle_resource); *path_out = base::mac::PathForFrameworkBundleResource(bundle_resource);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment