Revert "Remove shared_utils.h, use angle_common instead."

samples/samples.gyp

@@ -52,17 +52,13 @@
                     'includes': [ '../build/common_defines.gypi', ],
                     'dependencies':
                     [
-                        '<(angle_path)/src/angle.gyp:libEGL',
-                        '<(angle_path)/src/angle.gyp:libGLESv2',
-                        '<(angle_path)/util/util.gyp:angle_util',
-                    ],
-                    'export_dependent_settings':
-                    [
-                        '<(angle_path)/util/util.gyp:angle_util',
+                        '../src/angle.gyp:libEGL',
+                        '../src/angle.gyp:libGLESv2',
+                        '../util/util.gyp:angle_util',
                     ],
                     'include_dirs':
                     [
-                        '<(angle_path)/include',
+                        '../include',
                         'angle/sample_util',
                     ],
                     'sources':
@@ -75,7 +71,9 @@
                         'msvs_disabled_warnings': [ 4201 ],
                         'include_dirs':
                         [
+                            '../include',
                             'angle/sample_util',
+                            '../util',
                         ],
                     },
                 },

src/tests/end2end_tests/ANGLETest.h

@@ -14,7 +14,7 @@
 #include "angle_gl.h"
 #include <algorithm>
 
-#include "common/angleutils.h"
+#include "shared_utils.h"
 #include "shader_utils.h"
 
 #include "testfixturetypes.h"

src/tests/perf_tests/ANGLEPerfTest.h

@@ -20,7 +20,7 @@
 #include "EGLWindow.h"
 #include "OSWindow.h"
 #include "Timer.h"
-#include "common/angleutils.h"
+#include "shared_utils.h"
 
 class Event;
 

util/EGLWindow.h

@@ -21,7 +21,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "common/angleutils.h"
+#include "shared_utils.h"
 
 class OSWindow;
 

util/shared_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.
+//
+
+#ifndef UTIL_SHARED_UTILS_H
+#define UTIL_SHARED_UTILS_H
+
+#define SHADER_SOURCE(...) #__VA_ARGS__
+
+// A macro to disallow the copy constructor and operator= functions
+// This must be used in the private: declarations for a class
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+    TypeName(const TypeName&);             \
+    void operator=(const TypeName&)
+
+template <typename T, size_t N>
+inline size_t ArraySize(T(&)[N])
+{
+    return N;
+}
+
+#endif // UTIL_SHARED_UTILS_H

util/util.gyp

@@ -15,18 +15,13 @@
                     'includes': [ '../build/common_defines.gypi', ],
                     'dependencies':
                     [
-                        '<(angle_path)/src/angle.gyp:angle_common',
-                        '<(angle_path)/src/angle.gyp:libEGL',
-                        '<(angle_path)/src/angle.gyp:libGLESv2',
-                    ],
-                    'export_dependent_settings':
-                    [
-                        '<(angle_path)/src/angle.gyp:angle_common',
+                        '../src/angle.gyp:libEGL',
+                        '../src/angle.gyp:libGLESv2',
                     ],
                     'include_dirs':
                     [
-                        '<(angle_path)/include',
-                        '<(angle_path)/util',
+                        '../include',
+                        '.',
                     ],
                     'sources':
                     [
@@ -37,6 +32,7 @@
                         'random_utils.h',
                         'shader_utils.cpp',
                         'shader_utils.h',
+                        'shared_utils.h',
                         'testfixturetypes.h',
                         'EGLWindow.cpp',
                         'EGLWindow.h',
@@ -55,8 +51,7 @@
                     {
                         'include_dirs':
                         [
-                            '<(angle_path)/include',
-                            '<(angle_path)/util',
+                            '.',
                         ],
                     },
                 },