Revert "Change angle_util to be a shared library"

BUILD.gn

@@ -497,7 +497,7 @@ config("angle_util_config") {
   }
 }
 
-shared_library("angle_util") {
+static_library("angle_util") {
   sources = rebase_path(util_gypi.util_sources, ".", "util")
 
   if (is_win) {
@@ -514,10 +514,6 @@ shared_library("angle_util") {
 
   if (is_mac) {
     sources += rebase_path(util_gypi.util_osx_sources, ".", "util")
-    libs = [
-      "AppKit.framework",
-      "QuartzCore.framework",
-    ]
   }
 
   if (use_x11) {
@@ -542,7 +538,6 @@ shared_library("angle_util") {
   defines = [
     "GL_GLEXT_PROTOTYPES",
     "EGL_EGLEXT_PROTOTYPES",
-    "LIBANGLE_UTIL_IMPLEMENTATION",
   ]
 
   configs += [

include/export.h

@@ -10,15 +10,13 @@
 #define LIBGLESV2_EXPORT_H_
 
 #if defined(_WIN32)
-#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
-    defined(LIBANGLE_UTIL_IMPLEMENTATION)
+#   if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION)
 #       define ANGLE_EXPORT __declspec(dllexport)
 #   else
 #       define ANGLE_EXPORT __declspec(dllimport)
 #   endif
 #elif defined(__GNUC__)
-#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \
-    defined(LIBANGLE_UTIL_IMPLEMENTATION)
+#   if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION)
 #       define ANGLE_EXPORT __attribute__((visibility ("default")))
 #   else
 #       define ANGLE_EXPORT

src/tests/BUILD.gn

@@ -303,7 +303,6 @@ if (build_angle_deqp_tests) {
     shared_library(shared_library_name) {
       deps = [
         ":angle_deqp_libtester",
-        "//third_party/angle:angle_util",
       ]
 
       configs -= deqp_undefine_configs

util/EGLWindow.h

@@ -12,7 +12,6 @@
 #include <stdint.h>
 #include <string>
 
-#include <export.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES3/gl3.h>
@@ -29,7 +28,7 @@ class OSWindow;
 #define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE 0x6AC0
 #endif
 
-struct ANGLE_EXPORT EGLPlatformParameters
+struct EGLPlatformParameters
 {
     EGLint renderer;
     EGLint majorVersion;
@@ -47,10 +46,10 @@ struct ANGLE_EXPORT EGLPlatformParameters
                           EGLint presentPath);
 };
 
-ANGLE_EXPORT bool operator<(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
-ANGLE_EXPORT bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
+bool operator<(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
+bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
 
-class ANGLE_EXPORT EGLWindow : angle::NonCopyable
+class EGLWindow : angle::NonCopyable
 {
   public:
     EGLWindow(EGLint glesMajorVersion,

util/Matrix.h

@@ -10,11 +10,9 @@
 #ifndef UTIL_MATRIX_H
 #define UTIL_MATRIX_H
 
-#include <export.h>
-
 #include "Vector.h"
 
-struct ANGLE_EXPORT Matrix4
+struct Matrix4
 {
     float data[16];
 
@@ -51,13 +49,13 @@ struct ANGLE_EXPORT Matrix4
     static Vector3 transform(const Matrix4 &mat, const Vector4 &pt);
 };
 
-ANGLE_EXPORT Matrix4 operator*(const Matrix4 &a, const Matrix4 &b);
-ANGLE_EXPORT Matrix4 &operator*=(Matrix4 &a, const Matrix4 &b);
-ANGLE_EXPORT Matrix4 operator*(const Matrix4 &a, float b);
-ANGLE_EXPORT Matrix4 &operator*=(Matrix4 &a, float b);
-ANGLE_EXPORT Vector4 operator*(const Matrix4 &a, const Vector4 &b);
+Matrix4 operator*(const Matrix4 &a, const Matrix4 &b);
+Matrix4 &operator*=(Matrix4 &a, const Matrix4 &b);
+Matrix4 operator*(const Matrix4 &a, float b);
+Matrix4 &operator*=(Matrix4 &a, float b);
+Vector4 operator*(const Matrix4 &a, const Vector4 &b);
 
-ANGLE_EXPORT bool operator==(const Matrix4 &a, const Matrix4 &b);
-ANGLE_EXPORT bool operator!=(const Matrix4 &a, const Matrix4 &b);
+bool operator==(const Matrix4 &a, const Matrix4 &b);
+bool operator!=(const Matrix4 &a, const Matrix4 &b);
 
 #endif  // UTIL_MATRIX_H

util/OSPixmap.h

@@ -11,13 +11,12 @@
 
 #include <stdlib.h>
 
-#include <export.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "Event.h"
 
-class ANGLE_EXPORT OSPixmap
+class OSPixmap
 {
   public:
     OSPixmap() {}
@@ -28,6 +27,6 @@ class ANGLE_EXPORT OSPixmap
     virtual EGLNativePixmapType getNativePixmap() const = 0;
 };
 
-ANGLE_EXPORT OSPixmap *CreateOSPixmap();
+OSPixmap *CreateOSPixmap();
 
 #endif // SAMPLE_UTIL_PIXMAP_H_

util/OSWindow.h

@@ -11,13 +11,12 @@
 #include <stdint.h>
 #include <string>
 
-#include <export.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
 #include "Event.h"
 
-class ANGLE_EXPORT OSWindow
+class OSWindow
 {
   public:
     OSWindow();
@@ -64,6 +63,6 @@ class ANGLE_EXPORT OSWindow
     std::list<Event> mEvents;
 };
 
-ANGLE_EXPORT OSWindow *CreateOSWindow();
+OSWindow *CreateOSWindow();
 
 #endif // SAMPLE_UTIL_WINDOW_H

util/Timer.h

@@ -7,9 +7,7 @@
 #ifndef SAMPLE_UTIL_TIMER_H
 #define SAMPLE_UTIL_TIMER_H
 
-#include <export.h>
-
-class ANGLE_EXPORT Timer
+class Timer
 {
   public:
     virtual ~Timer() {}
@@ -18,6 +16,6 @@ class ANGLE_EXPORT Timer
     virtual double getElapsedTime() const = 0;
 };
 
-ANGLE_EXPORT Timer *CreateTimer();
+Timer *CreateTimer();
 
 #endif // SAMPLE_UTIL_TIMER_H

util/Vector.h

@@ -12,9 +12,7 @@
 
 #include <ostream>
 
-#include <export.h>
-
-struct ANGLE_EXPORT Vector2
+struct Vector2
 {
     Vector2();
     Vector2(float x, float y);
@@ -33,9 +31,9 @@ struct ANGLE_EXPORT Vector2
     float x, y;
 };
 
-ANGLE_EXPORT std::ostream &operator<<(std::ostream &stream, const Vector2 &vec);
+std::ostream &operator<<(std::ostream &stream, const Vector2 &vec);
 
-struct ANGLE_EXPORT Vector3
+struct Vector3
 {
     Vector3();
     Vector3(float x, float y, float z);
@@ -54,14 +52,14 @@ struct ANGLE_EXPORT Vector3
     float x, y, z;
 };
 
-ANGLE_EXPORT Vector3 operator*(const Vector3 &a, const Vector3 &b);
-ANGLE_EXPORT Vector3 operator*(const Vector3 &a, const float &b);
-ANGLE_EXPORT Vector3 operator/(const Vector3 &a, const Vector3 &b);
-ANGLE_EXPORT Vector3 operator/(const Vector3 &a, const float &b);
-ANGLE_EXPORT Vector3 operator+(const Vector3 &a, const Vector3 &b);
-ANGLE_EXPORT Vector3 operator-(const Vector3 &a, const Vector3 &b);
+Vector3 operator*(const Vector3 &a, const Vector3 &b);
+Vector3 operator*(const Vector3 &a, const float &b);
+Vector3 operator/(const Vector3 &a, const Vector3 &b);
+Vector3 operator/(const Vector3 &a, const float &b);
+Vector3 operator+(const Vector3 &a, const Vector3 &b);
+Vector3 operator-(const Vector3 &a, const Vector3 &b);
 
-struct ANGLE_EXPORT Vector4
+struct Vector4
 {
     Vector4();
     Vector4(float x, float y, float z, float w);

util/random_utils.h

@@ -13,12 +13,10 @@
 // TODO(jmadill): Rework this if Chromium decides to ban <random>
 #include <random>
 
-#include <export.h>
-
 namespace angle
 {
 
-class ANGLE_EXPORT RNG
+class RNG
 {
   public:
     // Seed from clock

util/shader_utils.h

@@ -7,7 +7,6 @@
 #ifndef SAMPLE_UTIL_SHADER_UTILS_H
 #define SAMPLE_UTIL_SHADER_UTILS_H
 
-#include <export.h>
 #include <GLES3/gl3.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ -19,15 +18,15 @@
 
 #define SHADER_SOURCE(...) #__VA_ARGS__
 
-ANGLE_EXPORT GLuint CompileShader(GLenum type, const std::string &source);
-ANGLE_EXPORT GLuint CompileShaderFromFile(GLenum type, const std::string &sourcePath);
+GLuint CompileShader(GLenum type, const std::string &source);
+GLuint CompileShaderFromFile(GLenum type, const std::string &sourcePath);
 
-ANGLE_EXPORT GLuint
-CompileProgramWithTransformFeedback(const std::string &vsSource,
-                                    const std::string &fsSource,
-                                    const std::vector<std::string> &transformFeedbackVaryings,
-                                    GLenum bufferMode);
-ANGLE_EXPORT GLuint CompileProgram(const std::string &vsSource, const std::string &fsSource);
-ANGLE_EXPORT GLuint CompileProgramFromFiles(const std::string &vsPath, const std::string &fsPath);
+GLuint CompileProgramWithTransformFeedback(
+    const std::string &vsSource,
+    const std::string &fsSource,
+    const std::vector<std::string> &transformFeedbackVaryings,
+    GLenum bufferMode);
+GLuint CompileProgram(const std::string &vsSource, const std::string &fsSource);
+GLuint CompileProgramFromFiles(const std::string &vsPath, const std::string &fsPath);
 
 #endif // SAMPLE_UTIL_SHADER_UTILS_H

util/system_utils.h

@@ -11,33 +11,31 @@
 
 #include <string>
 
-#include <export.h>
-
 #include "common/angleutils.h"
 
 namespace angle
 {
 
-ANGLE_EXPORT std::string GetExecutablePath();
-ANGLE_EXPORT std::string GetExecutableDirectory();
-ANGLE_EXPORT std::string GetSharedLibraryExtension();
+std::string GetExecutablePath();
+std::string GetExecutableDirectory();
+std::string GetSharedLibraryExtension();
 
 // Cross platform equivalent of the Windows Sleep function
-ANGLE_EXPORT void Sleep(unsigned int milliseconds);
+void Sleep(unsigned int milliseconds);
 
-ANGLE_EXPORT void SetLowPriorityProcess();
+void SetLowPriorityProcess();
 
 // Write a debug message, either to a standard output or Debug window.
-ANGLE_EXPORT void WriteDebugMessage(const char *format, ...);
+void WriteDebugMessage(const char *format, ...);
 
-class ANGLE_EXPORT Library : angle::NonCopyable
+class Library : angle::NonCopyable
 {
   public:
     virtual ~Library() {}
     virtual void *getSymbol(const std::string &symbolName) = 0;
 };
 
-ANGLE_EXPORT Library *loadLibrary(const std::string &libraryName);
+Library *loadLibrary(const std::string &libraryName);
 
 } // namespace angle
 

util/x11/X11Window.h

@@ -14,11 +14,9 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
-#include <export.h>
-
 #include "OSWindow.h"
 
-class ANGLE_EXPORT X11Window : public OSWindow
+class X11Window : public OSWindow
 {
   public:
     X11Window();