Commit 27460dfc by Peter Kotwicz Committed by Jamie Madill

Do not attempt to compile angle_end2end_tests or angle_perftests on Android

BUG=507294 Change-Id: Ied198a26f5eecab1dc608a06c2cc5e3be08cc28c Reviewed-on: https://chromium-review.googlesource.com/306460Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Tested-by: 's avatarPeter Kotwicz <pkotwicz@chromium.org>
parent adb857b2
...@@ -40,86 +40,88 @@ test("angle_unittests") { ...@@ -40,86 +40,88 @@ test("angle_unittests") {
] ]
} }
end2end_gypi = exec_script("//build/gypi_to_gn.py", if (is_win || is_linux || is_mac) {
[ end2end_gypi = exec_script("//build/gypi_to_gn.py",
rebase_path("angle_end2end_tests.gypi"),
"--replace=<(angle_path)=.",
],
"scope",
[ "angle_end2end_tests.gypi" ])
test("angle_end2end_tests") {
include_dirs = [
"testing/gtest/include",
"../../src/tests",
"../../util",
]
sources = rebase_path(end2end_gypi.angle_end2end_tests_sources, ".", "../..")
if (is_win) {
sources +=
rebase_path(end2end_gypi.angle_end2end_tests_win_sources, ".", "../..")
}
sources += [ "//gpu/angle_end2end_tests_main.cc" ]
configs += [
"//third_party/angle:internal_config",
"//third_party/angle:libANGLE_config",
]
deps = [
"//base",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:angle_util",
"//third_party/angle:libANGLE",
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/angle:preprocessor",
"//third_party/angle:translator_static",
]
}
perftests_gypi = exec_script("//build/gypi_to_gn.py",
[ [
rebase_path("angle_perftests.gypi"), rebase_path("angle_end2end_tests.gypi"),
"--replace=<(angle_path)=.", "--replace=<(angle_path)=.",
], ],
"scope", "scope",
[ "angle_perftests.gypi" ]) [ "angle_end2end_tests.gypi" ])
test("angle_end2end_tests") {
include_dirs = [
"testing/gtest/include",
"../../src/tests",
"../../util",
]
sources = rebase_path(end2end_gypi.angle_end2end_tests_sources, ".", "../..")
if (is_win) {
sources +=
rebase_path(end2end_gypi.angle_end2end_tests_win_sources, ".", "../..")
}
sources += [ "//gpu/angle_end2end_tests_main.cc" ]
configs += [
"//third_party/angle:internal_config",
"//third_party/angle:libANGLE_config",
]
deps = [
"//base",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:angle_util",
"//third_party/angle:libANGLE",
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/angle:preprocessor",
"//third_party/angle:translator_static",
]
}
}
test("angle_perftests") { if (is_win) {
include_dirs = [ perftests_gypi = exec_script("//build/gypi_to_gn.py",
"testing/gtest/include", [
"../../src/tests", rebase_path("angle_perftests.gypi"),
"../../util", "--replace=<(angle_path)=.",
] ],
"scope",
[ "angle_perftests.gypi" ])
test("angle_perftests") {
include_dirs = [
"testing/gtest/include",
"../../src/tests",
"../../util",
]
sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..") sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..")
if (is_win) {
sources += sources +=
rebase_path(perftests_gypi.angle_perf_tests_win_sources, ".", "../..") rebase_path(perftests_gypi.angle_perf_tests_win_sources, ".", "../..")
sources += [ "//gpu/angle_perftests_main.cc" ]
configs += [
"//third_party/angle:internal_config",
"//third_party/angle:libANGLE_config",
]
deps = [
"//base",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:angle_util",
"//third_party/angle:libANGLE",
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
]
} }
sources += [ "//gpu/angle_perftests_main.cc" ]
configs += [
"//third_party/angle:internal_config",
"//third_party/angle:libANGLE_config",
]
deps = [
"//base",
"//base/test:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/angle:angle_util",
"//third_party/angle:libANGLE",
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
]
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment