util.gni

Branch :

Show log
Commit
Author : Jamie Madill
Date : 2019-10-20 21:44:36
Hash : f939cb63
Message : Revert "Reland "Add more test_utils functions."" This reverts commit 7923e234bc458eda5936b8cb4f09fa19e28c0452. Reason for revert: Fails compilation on rollers: [2097/6048] SOLINK ./lib_angle_unittests__library.cr.so FAILED: lib_angle_unittests__library.cr.so lib_angle_unittests__library.cr.so.TOC lib.unstripped/lib_angle_unittests__library.cr.so python "../../build/toolchain/gcc_solink_wrapper.py" --readelf="../../third_party/android_ndk/toolch...(too long) ld.lld: error: undefined symbol: glCreateShader >>> referenced by shader_utils.cpp >>> angle_util_static/shader_utils.o:(CompileShader(unsigned int, char const*)) in archive obj/third_party/angle/libangle_util_static.a ld.lld: error: undefined symbol: glShaderSource Original change's description: > Reland "Add more test_utils functions." > > This is a reland of 5fcfcea4a9379633a83a67fc1d94938cb31f2a9c > > Re-land uses static linking with angle_util. The root cause > of the CFI error wasn't solved. Static linking works around > the problem by not using any export rules. > > Original change's description: > > Add more test_utils functions. > > > > Includes methods for creating temporary files, deleting files, and > > reading files into a string. Also renames GetPathSeparator to mention > > it's only used for environment variables. Includes a new virtual type > > angle::Process that will be used to implement cross-platform async > > Process launching for tests. Also includes a way to specify a custom > > crash handler callback. > > > > Also adds a few unit tests for the new functionality. They are disabled > > on Android because the functions are not needed by the new test runner. > > > > Bug: angleproject:3162 > > Change-Id: I3e2c2e9837608884c98379fa0f78c9ffbe158d73 > > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1821940 > > Commit-Queue: Jamie Madill <jmadill@chromium.org> > > Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> > > Bug: chromium:1015810 > Bug: angleproject:3162 > Change-Id: I6a2c1e7b585a13ca846759f32da0777c00d7f7e6 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1869541 > Commit-Queue: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> TBR=ynovikov@chromium.org,jonahr@google.com,jmadill@chromium.org Change-Id: I975b2214411906cb981bffa04fa50e0a65ff8b4e No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1015810, angleproject:3162 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1870811 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

util/util.gni

# Copyright 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.

util_sources = [
  "util/com_utils.h",
  "util/keyboard.h",
  "util/geometry_utils.cpp",
  "util/geometry_utils.h",
  "util/mouse.h",
  "util/random_utils.cpp",
  "util/random_utils.h",
  "util/shader_utils.cpp",
  "util/shader_utils.h",
  "util/test_utils.h",
  "util/util_export.h",
  "util/util_gl.h",
  "util/Event.h",
  "util/EGLPlatformParameters.h",
  "util/EGLWindow.cpp",
  "util/EGLWindow.h",
  "util/Matrix.cpp",
  "util/Matrix.h",
  "util/OSPixmap.h",
  "util/OSWindow.cpp",
  "util/OSWindow.h",
  "util/Timer.h",
  "util/Timer.cpp",
]

util_win_sources = [
  "util/windows/test_utils_win.cpp",
  "util/windows/win32/test_utils_win32.cpp",
  "util/windows/win32/Win32Pixmap.cpp",
  "util/windows/win32/Win32Pixmap.h",
  "util/windows/win32/Win32Window.cpp",
  "util/windows/win32/Win32Window.h",
  "util/windows/WGLWindow.h",
]

if (current_os != "winuwp") {
  util_win_shared_sources = [ "util/windows/WGLWindow.cpp" ]
}

util_posix_sources = [
  "util/posix/crash_handler_posix.cpp",
  "util/posix/test_utils_posix.cpp",
]

util_linux_sources = util_posix_sources

util_x11_sources = [
  "util/x11/X11Pixmap.cpp",
  "util/x11/X11Pixmap.h",
  "util/x11/X11Window.cpp",
  "util/x11/X11Window.h",
]

util_fuchsia_sources = util_posix_sources + [
                         "util/fuchsia/ScenicWindow.cpp",
                         "util/fuchsia/ScenicWindow.h",
                       ]

util_ozone_sources = [
  "util/ozone/OzonePixmap.cpp",
  "util/ozone/OzoneWindow.cpp",
  "util/ozone/OzoneWindow.h",
]

util_osx_sources = util_posix_sources + [
                     "util/osx/OSXPixmap.mm",
                     "util/osx/OSXPixmap.h",
                     "util/osx/OSXWindow.mm",
                     "util/osx/OSXWindow.h",
                   ]

util_android_sources = util_posix_sources + [
                         "util/android/AndroidPixmap.cpp",
                         "util/android/AndroidWindow.cpp",
                         "util/android/AndroidWindow.h",
                         "util/android/third_party/android_native_app_glue.c",
                         "util/android/third_party/android_native_app_glue.h",
                       ]

kc3-lang/angle/util/util.gni

Commit

kc3-lang/angle /util/util.gni