AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sk_tools/Resources: optional SK_TOOLS_REQUIRE_RESOURCES flag

Browse Source 
BUG=skia:7842
Change-Id: I1ce7d12308cd8ee101163d73dfc79f2d2155c632
Reviewed-on: https://skia-review.googlesource.com/123425
Auto-Submit: Hal Canary <halcanary@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Hal Canary 2018-04-24 11:47:23 -04:00 committed by Skia Commit-Bot
parent 32d19c42a2
commit fd9bcabca1
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD.gn
View File

@ -54,6 +54,8 @@ declare_args() {
skia_llvm_path = ""
skia_llvm_lib = "LLVM"
skia_tools_require_resources = false
}
declare_args() {
skia_use_dng_sdk = !is_fuchsia && skia_use_libjpeg_turbo && skia_use_zlib
@ -1344,6 +1346,10 @@ if (skia_enable_tools) {
sources += [ "tools/ios_utils.m" ]
libs += [ "Foundation.framework" ]
}
defines = []
if (skia_tools_require_resources) {
defines += [ "SK_TOOLS_REQUIRE_RESOURCES" ]
}
deps = [
":common_flags",
":experimental_svg_model",

14
tools/Resources.cpp
View File

@ -43,17 +43,15 @@ std::unique_ptr<SkStreamAsset> GetResourceAsStream(const char* resource) {
}
sk_sp<SkData> GetResourceAsData(const char* resource) {
if (gResourceFactory) {
if (auto data = gResourceFactory(resource)) {
return data;
}
SkDebugf("Resource \"%s\" not found.\n", resource);
SK_ABORT("missing resource");
}
if (auto data = SkData::MakeFromFileName(GetResourcePath(resource).c_str())) {
if (sk_sp<SkData> data = gResourceFactory
? gResourceFactory(resource)
: SkData::MakeFromFileName(GetResourcePath(resource).c_str())) {
return data;
}
SkDebugf("Resource \"%s\" not found.\n", resource);
#ifdef SK_TOOLS_REQUIRE_RESOURCES
SK_ABORT("missing resource");
#endif
return nullptr;
}

1
tools/skqp/generate_gn_args
View File

@ -24,6 +24,7 @@ skia_use_lua = false
skia_use_piex = false
skia_use_skcms = false
skia_skqp_enable_driver_correctness_workarounds = {enable_workarounds}
skia_tools_require_resources = true
'''
def parse_args():