Move some file utils to common.

BUILD.gn

@@ -131,6 +131,18 @@ config("angle_common_config") {
 static_library("angle_common") {
   sources = rebase_path(gles_gypi.libangle_common_sources, ".", "src")
 
+  if (is_linux || is_android) {
+    sources += rebase_path(gles_gypi.libangle_common_linux_sources, ".", "src")
+  }
+
+  if (is_mac) {
+    sources += rebase_path(gles_gypi.libangle_common_mac_sources, ".", "src")
+  }
+
+  if (is_win) {
+    sources += rebase_path(gles_gypi.libangle_common_win_sources, ".", "src")
+  }
+
   configs -= angle_undefine_configs
   configs += [
     ":angle_common_config",

samples/samples.gyp

@@ -19,12 +19,14 @@
             'includes': [ '../gyp/common_defines.gypi', ],
             'dependencies':
             [
+                '<(angle_path)/src/angle.gyp:angle_common',
                 '<(angle_path)/src/angle.gyp:libEGL',
                 '<(angle_path)/src/angle.gyp:libGLESv2',
                 '<(angle_path)/util/util.gyp:angle_util',
             ],
             'export_dependent_settings':
             [
+                '<(angle_path)/src/angle.gyp:angle_common',
                 '<(angle_path)/util/util.gyp:angle_util',
             ],
             'include_dirs':

src/angle.gyp

@@ -140,7 +140,25 @@
                             ],
                         },
                     },
+                    'sources':
+                    [
+                        '<@(libangle_common_win_sources)',
+                    ],
                 }],
+                ['OS=="mac"',
+                {
+                    'sources':
+                    [
+                        '<@(libangle_common_mac_sources)',
+                    ],
+                }],
+                ['OS=="linux"',
+                {
+                    'sources':
+                    [
+                        '<@(libangle_common_linux_sources)',
+                    ],
+                }]
             ],
         },
 

src/common/system_utils.h

+//
+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// system_utils.h: declaration of OS-specific utility functions
+
+#ifndef COMMON_SYSTEM_UTILS_H_
+#define COMMON_SYSTEM_UTILS_H_
+
+#include "common/angleutils.h"
+
+namespace angle
+{
+
+const char *GetExecutablePath();
+const char *GetExecutableDirectory();
+const char *GetSharedLibraryExtension();
+
+}  // namespace angle
+
+#endif  // COMMON_SYSTEM_UTILS_H_

util/linux/Linux_system_utils.cpp → src/common/system_utils_linux.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-// Linux_system_utils.cpp: Implementation of OS-specific functions for Linux
+// system_utils_linux.cpp: Implementation of OS-specific functions for Linux
 
 #include "system_utils.h"
 
@@ -46,12 +46,14 @@ std::string GetExecutableDirectoryImpl()
 
 const char *GetExecutablePath()
 {
+    // TODO(jmadill): Make global static string thread-safe.
     const static std::string &exePath = GetExecutablePathImpl();
     return exePath.c_str();
 }
 
 const char *GetExecutableDirectory()
 {
+    // TODO(jmadill): Make global static string thread-safe.
     const static std::string &exeDir = GetExecutableDirectoryImpl();
     return exeDir.c_str();
 }

util/osx/OSX_system_utils.cpp → src/common/system_utils_mac.cpp

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-// OSX_system_utils.cpp: Implementation of OS-specific functions for OSX
+// system_utils_osx.cpp: Implementation of OS-specific functions for OSX
 
 #include "system_utils.h"
 
@@ -49,12 +49,14 @@ std::string GetExecutableDirectoryImpl()
 
 const char *GetExecutablePath()
 {
+    // TODO(jmadill): Make global static string thread-safe.
     const static std::string &exePath = GetExecutablePathImpl();
     return exePath.c_str();
 }
 
 const char *GetExecutableDirectory()
 {
+    // TODO(jmadill): Make global static string thread-safe.
     const static std::string &exeDir = GetExecutableDirectoryImpl();
     return exeDir.c_str();
 }

src/common/system_utils_win.cpp

+//
+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// system_utils_win.cpp: Implementation of OS-specific functions for Windows
+
+#include "system_utils.h"
+
+#include <stdarg.h>
+#include <windows.h>
+#include <array>
+#include <vector>
+
+namespace angle
+{
+
+namespace
+{
+
+std::string GetExecutablePathImpl()
+{
+    std::array<char, MAX_PATH> executableFileBuf;
+    DWORD executablePathLen = GetModuleFileNameA(NULL, executableFileBuf.data(),
+                                                 static_cast<DWORD>(executableFileBuf.size()));
+    return (executablePathLen > 0 ? std::string(executableFileBuf.data()) : "");
+}
+
+std::string GetExecutableDirectoryImpl()
+{
+    std::string executablePath = GetExecutablePath();
+    size_t lastPathSepLoc      = executablePath.find_last_of("\\/");
+    return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : "";
+}
+
+}  // anonymous namespace
+
+const char *GetExecutablePath()
+{
+    // TODO(jmadill): Make global static string thread-safe.
+    const static std::string &exePath = GetExecutablePathImpl();
+    return exePath.c_str();
+}
+
+const char *GetExecutableDirectory()
+{
+    // TODO(jmadill): Make global static string thread-safe.
+    const static std::string &exeDir = GetExecutableDirectoryImpl();
+    return exeDir.c_str();
+}
+
+const char *GetSharedLibraryExtension()
+{
+    return "dll";
+}
+
+}  // namespace angle

src/libGLESv2.gypi

@@ -37,6 +37,18 @@
             'common/vector_utils.h',
             'common/version.h',
         ],
+        'libangle_common_linux_sources':
+        [
+            'common/system_utils_linux.cpp',
+        ],
+        'libangle_common_mac_sources':
+        [
+            'common/system_utils_mac.cpp',
+        ],
+        'libangle_common_win_sources':
+        [
+            'common/system_utils_win.cpp',
+        ],
         'libangle_image_util_sources':
         [
             'image_util/copyimage.cpp',

src/tests/BUILD.gn

@@ -280,6 +280,7 @@ if (build_angle_deqp_tests) {
   static_library("angle_deqp_libtester") {
     public_deps = [
       ":angle_deqp_decpp",
+      "//third_party/angle:angle_common",
       "//third_party/angle:angle_util",
       "//third_party/angle:libEGL",
       "//third_party/libpng:libpng",

src/tests/deqp.gypi

@@ -1528,6 +1528,7 @@
                     'type': 'static_library',
                     'dependencies':
                     [
+                        '<(angle_path)/src/angle.gyp:angle_common',
                         'angle_deqp_decpp',
                         'angle_deqp_support',
                         'angle_libpng',

util/system_utils.h

@@ -14,14 +14,11 @@
 #include <export.h>
 
 #include "common/angleutils.h"
+#include "common/system_utils.h"
 
 namespace angle
 {
 
-ANGLE_EXPORT const char *GetExecutablePath();
-ANGLE_EXPORT const char *GetExecutableDirectory();
-ANGLE_EXPORT const char *GetSharedLibraryExtension();
-
 // Cross platform equivalent of the Windows Sleep function
 ANGLE_EXPORT void Sleep(unsigned int milliseconds);
 

util/util.gyp

@@ -52,7 +52,6 @@
         ],
         'util_linux_sources':
         [
-            'linux/Linux_system_utils.cpp',
             'linux/LinuxTimer.cpp',
             'linux/LinuxTimer.h',
             'posix/Posix_system_utils.cpp',
@@ -72,7 +71,6 @@
         ],
         'util_osx_sources':
         [
-            'osx/OSX_system_utils.cpp',
             'osx/OSXTimer.cpp',
             'osx/OSXTimer.h',
             'osx/OSXPixmap.mm',

util/windows/Windows_system_utils.cpp

@@ -16,43 +16,6 @@
 namespace angle
 {
 
-namespace
-{
-
-std::string GetExecutablePathImpl()
-{
-    std::array<char, MAX_PATH> executableFileBuf;
-    DWORD executablePathLen = GetModuleFileNameA(NULL, executableFileBuf.data(),
-                                                 static_cast<DWORD>(executableFileBuf.size()));
-    return (executablePathLen > 0 ? std::string(executableFileBuf.data()) : "");
-}
-
-std::string GetExecutableDirectoryImpl()
-{
-    std::string executablePath = GetExecutablePath();
-    size_t lastPathSepLoc = executablePath.find_last_of("\\/");
-    return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : "";
-}
-
-}  // anonymous namespace
-
-const char *GetExecutablePath()
-{
-    const static std::string &exePath = GetExecutablePathImpl();
-    return exePath.c_str();
-}
-
-const char *GetExecutableDirectory()
-{
-    const static std::string &exeDir = GetExecutableDirectoryImpl();
-    return exeDir.c_str();
-}
-
-const char *GetSharedLibraryExtension()
-{
-    return "dll";
-}
-
 void Sleep(unsigned int milliseconds)
 {
     ::Sleep(static_cast<DWORD>(milliseconds));