From a92c383e2f1ceb0323aef79fa444450e6a3e1c03 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 8 Dec 2016 09:49:39 -0500 Subject: libviewer.so on Android, delete hello_skia_app This spins off parts of 5620 to bake while we work through how to do the rest of libviewer.so -> viewer.apk. Change-Id: I1cbf135cc952eeb7593e80a5a752dcadaa2dbb00 Reviewed-on: https://skia-review.googlesource.com/5656 Reviewed-by: Derek Sollenberger Commit-Queue: Mike Klein --- BUILD.gn | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index 1ee4d609c1..c687ded6de 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1311,8 +1311,8 @@ if (skia_enable_tools) { testonly = true } - if (skia_enable_gpu && (is_linux || is_win || is_mac)) { - executable("viewer") { + if (skia_enable_gpu && (is_android || is_linux || is_win || is_mac)) { + source_set("viewer_sources") { sources = [ "tools/viewer/GMSlide.cpp", "tools/viewer/ImageSlide.cpp", @@ -1389,6 +1389,22 @@ if (skia_enable_tools) { } testonly = true } + + if (is_android) { + shared_library("libviewer") { + deps = [ + ":viewer_sources", + ] + testonly = true + } + } else { + executable("viewer") { + deps = [ + ":viewer_sources", + ] + testonly = true + } + } } if (skia_enable_gpu) { -- cgit v1.2.3