aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm/DM.cpp
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-01-30 14:00:54 -0500
committerGravatar Mike Klein <mtklein@chromium.org>2017-01-31 17:06:21 +0000
commit6d3b7aaf79b2cbacdf00bafc15ded2dfd2fa000a (patch)
tree8bc8a0847c44027d988ae4f7fae794955d298147 /dm/DM.cpp
parent4427f165d792a93649e2b2673d3d8b89a35e8186 (diff)
gn: iOS packaging script
This is enough to run DM on my iPad. I've tweaks DM so that it can run as built by both GN and GYP. When we kill off GYP, all the dm_main() nonsense goes away. CQ_INCLUDE_TRYBOTS=skia.primary:Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug,Build-Mac-Clang-arm64-Debug-GN_iOS Change-Id: I59176bc203ee3180618b94ac5f9d291e0ad20b62 Reviewed-on: https://skia-review.googlesource.com/7757 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'dm/DM.cpp')
-rw-r--r--dm/DM.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 7159f1946b..6dc1bd96fb 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1473,7 +1473,7 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex
}
} // namespace skiatest
-#if !defined(SK_BUILD_FOR_IOS)
+#if !defined(SK_BUILD_FOR_IOS) || defined(DM_DEFINE_MAIN)
int main(int argc, char** argv) {
SkCommandLineFlags::Parse(argc, argv);
return dm_main();