Commit 359487c8 by Yuly Novikov Committed by Commit Bot

Build angle_perftests on Android

BUG=chromium:675997 Change-Id: Ib6690f9f25a4ba4510cf6e18ba2054a9936dc574 Reviewed-on: https://chromium-review.googlesource.com/706455Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent a3d384ad
...@@ -153,7 +153,7 @@ if (is_win || is_linux || is_mac || is_android) { ...@@ -153,7 +153,7 @@ if (is_win || is_linux || is_mac || is_android) {
} }
} }
if (is_win || is_linux) { if (is_win || is_linux || is_android) {
perftests_gypi = exec_script("//build/gypi_to_gn.py", perftests_gypi = exec_script("//build/gypi_to_gn.py",
[ [
rebase_path("angle_perftests.gypi"), rebase_path("angle_perftests.gypi"),
...@@ -169,6 +169,11 @@ if (is_win || is_linux) { ...@@ -169,6 +169,11 @@ if (is_win || is_linux) {
"../../util", "../../util",
] ]
if (is_android) {
use_native_activity = true
configs -= [ "//build/config/android:hide_all_but_jni" ]
}
sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..") sources = rebase_path(perftests_gypi.angle_perf_tests_sources, ".", "../..")
if (is_win) { if (is_win) {
...@@ -320,7 +325,7 @@ if (build_angle_deqp_tests) { ...@@ -320,7 +325,7 @@ if (build_angle_deqp_tests) {
sources += [ "//gpu/angle_deqp_tests_main.cc" ] sources += [ "//gpu/angle_deqp_tests_main.cc" ]
if (!is_android) { if (!is_android) {
public_deps += ["//third_party/angle:angle_gpu_info_util"] public_deps += [ "//third_party/angle:angle_gpu_info_util" ]
} }
} }
......
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