diff options
| author | Hal Canary <halcanary@google.com> | 2019-02-06 15:42:27 -0500 |
|---|---|---|
| committer | Hal Canary <halcanary@google.com> | 2019-02-07 12:43:31 -0500 |
| commit | a1c4141de3a750af0359ab3726ddbd3c87f02adc (patch) | |
| tree | 73d9943ce053e7055d81d2e9f88cbbbc200f98c9 /tools | |
| parent | 6ebb3487fe91456098033b71ae6be6fc5b4d997e (diff) | |
| download | skqp-a1c4141de3a750af0359ab3726ddbd3c87f02adc.tar.gz | |
Add resources and build files required to build CtsSkQPTestCases
This is essentially what derek did here:
https://android.googlesource.com/platform/external/skqp/+/4e83d4bdaf3a
Change-Id: Ic85ceab20c6431fe9966e151dbb810bb0e78c779
Diffstat (limited to 'tools')
| -rwxr-xr-x[-rw-r--r--] | tools/skqp/gn_to_bp.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/skqp/gn_to_bp.py b/tools/skqp/gn_to_bp.py index 02bd638c4b..e44c6373d5 100644..100755 --- a/tools/skqp/gn_to_bp.py +++ b/tools/skqp/gn_to_bp.py @@ -32,7 +32,6 @@ cc_library_shared { sdk_version: "26", stl: "libc++_static", compile_multilib: "both", - tags: ["tests", "optional"], cflags: [ $cflags @@ -49,6 +48,7 @@ cc_library_shared { ], srcs: [ + "third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp", $srcs ], @@ -122,10 +122,10 @@ gn_args = { 'is_debug': 'false', 'ndk_api': '26', 'skia_skqp_global_error_tolerance': '8', + 'skia_tools_require_resources': 'true', # setup vulkan 'skia_use_vulkan': 'true', - 'skia_vulkan_header': '"Skia_Vulkan_Android.h"', # enable/disable skia subsystems 'skia_enable_fontmgr_empty': 'true', @@ -157,6 +157,9 @@ cflags_cc = strip_slashes(js['targets']['//:libskqp_app']['cflags_cc']) local_includes = strip_slashes(js['targets']['//:libskqp_app']['include_dirs']) defines = {str(d) for d in js['targets']['//:libskqp_app']['defines']} +defines.update(["SK_ENABLE_DUMP_GPU", "SK_BUILD_FOR_SKQP"]) +cflags_cc.update(['-Wno-extra-semi-stmt']) + gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None) gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs', local_includes, 'freetype') @@ -205,6 +208,7 @@ with open('Android.bp', 'w') as f: defs['ssse3'] + defs['sse41'] + defs['sse42'] + - defs['avx' ]), + defs['avx'] + + defs['hsw']), }) |