Allow compiling dEQP on Mac in Chromium checkout.

BUG=angleproject:2137 Change-Id: I5d840fcd7fda85d7c33a2f261586e8c3733b9781 Reviewed-on: https://chromium-review.googlesource.com/661419Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Allow compiling dEQP on Mac in Chromium checkout.
af01602e · Corentin Wallez · Commit Bot · d68248be · af01602e · af01602e
Commit af01602e authored Sep 11, 2017 by Corentin Wallez Committed by Commit Bot Sep 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 32 deletions

DEPS.chromium DEPS.chromium +11 -29

BUILD.gn src/tests/BUILD.gn +3 -3

No files found.
--- a/DEPS.chromium
+++ b/DEPS.chromium
@@ -28,37 +28,19 @@ vars = {
  'vulkan_revision': 'f47c534fee2f26f6b783209d56e0ade48e30eb8d',
 }
-deps_os = {
+deps = {
-  'win': {
+  'src/third_party/deqp/src':
-    'src/third_party/deqp/src':
+    Var('android_git') + '/platform/external/deqp@' + Var('deqp_revision'),
-      Var('android_git') + '/platform/external/deqp@' + Var('deqp_revision'),
-    'src/third_party/glslang-angle/src':
+  'src/third_party/glslang-angle/src':
-      Var('android_git') + '/platform/external/shaderc/glslang@' + Var('glslang_revision'),
+    Var('android_git') + '/platform/external/shaderc/glslang@' + Var('glslang_revision'),
-    'src/third_party/spirv-headers/src':
+  'src/third_party/spirv-headers/src':
-      Var('android_git') + '/platform/external/shaderc/spirv-headers@' + Var('spirv_headers_revision'),
+    Var('android_git') + '/platform/external/shaderc/spirv-headers@' + Var('spirv_headers_revision'),
-    'src/third_party/spirv-tools-angle/src':
+  'src/third_party/spirv-tools-angle/src':
-      Var('android_git') + '/platform/external/shaderc/spirv-tools@' + Var('spirv_tools_revision'),
+    Var('android_git') + '/platform/external/shaderc/spirv-tools@' + Var('spirv_tools_revision'),
-    'src/third_party/vulkan-validation-layers/src':
+  'src/third_party/vulkan-validation-layers/src':
-      Var('android_git') + '/platform/external/vulkan-validation-layers@' + Var('vulkan_revision'),
+    Var('android_git') + '/platform/external/vulkan-validation-layers@' + Var('vulkan_revision'),
-  },
-  'unix': {
-    'src/third_party/deqp/src':
-      Var('android_git') + '/platform/external/deqp@' + Var('deqp_revision'),
-    'src/third_party/glslang-angle/src':
-      Var('android_git') + '/platform/external/shaderc/glslang@' + Var('glslang_revision'),
-    'src/third_party/spirv-headers/src':
-      Var('android_git') + '/platform/external/shaderc/spirv-headers@' + Var('spirv_headers_revision'),
-    'src/third_party/spirv-tools-angle/src':
-      Var('android_git') + '/platform/external/shaderc/spirv-tools@' + Var('spirv_tools_revision'),
-    'src/third_party/vulkan-validation-layers/src':
-      Var('android_git') + '/platform/external/vulkan-validation-layers@' + Var('vulkan_revision'),
-  },
 }
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -235,7 +235,7 @@ if (build_angle_deqp_tests) {
      # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
      defines += [ "_GNU_SOURCE" ]
    }
-    if (is_android) {
+    if (is_android || is_mac) {
      # _XOPEN_SOURCE=600 is what is used in deqp/src/Android.mk
      defines += [ "_XOPEN_SOURCE=600" ]
    }
@@ -254,7 +254,7 @@ if (build_angle_deqp_tests) {
    ]
  }
-  if (is_linux || is_android) {
+  if (is_linux || is_android || is_mac) {
    deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ]
  }
@@ -291,7 +291,7 @@ if (build_angle_deqp_tests) {
    if (is_win) {
      sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..")
    }
-    if (is_linux || is_android) {
+    if (is_linux || is_android || is_mac) {
      sources +=
          rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..")
    }