Cut SkQP 2019-10-28

No-Try: true
Change-Id: Ib42f49b8fc52ee91e3576e0823728949afcf6fbe
diff --git a/platform_tools/android/apps/skqp/src/main/assets/files.checksum b/platform_tools/android/apps/skqp/src/main/assets/files.checksum
new file mode 100644
index 0000000..4f578c4
--- /dev/null
+++ b/platform_tools/android/apps/skqp/src/main/assets/files.checksum
@@ -0,0 +1 @@
+3705757cf56c227ec4f74ee83d6f0054
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
new file mode 100644
index 0000000..e23f125
--- /dev/null
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
@@ -0,0 +1,747 @@
+3dgm,-1
+3x3bitmaprect,0
+AnimCodecPlayer,0
+BlurBigSigma,0
+BlurDrawImage,-1
+CubicStroke,-1
+OverStroke,-1
+PlusMergesAA,0
+aaclip,-1
+aarectmodes,-1
+aaxfermodes,-1
+addarc,-1
+addarc_meas,-1
+all_bitmap_configs,0
+all_variants_8888,0
+alpha_image,0
+alphagradients,0
+analytic_antialias_convex,-1
+analytic_antialias_general,-1
+analytic_antialias_inverse,0
+analytic_gradients,-1
+androidblendmodes,0
+animated-image-blurs,-1
+animatedGif,0
+anisotropic_hq,-1
+annotated_text,0
+arccirclegap,-1
+arcofzorro,-1
+arcto,-1
+arcto_skbug_9272,0
+arithmode,0
+async_rescale_and_read_dog_down,0
+async_rescale_and_read_dog_up,0
+async_rescale_and_read_no_bleed,0
+async_rescale_and_read_rose,0
+async_rescale_and_read_text_down,0
+async_rescale_and_read_text_up,0
+async_rescale_and_read_text_up_large,0
+async_rescale_and_read_yuv420_rose,0
+b_119394958,-1
+backdrop_hintrect_clipping,-1
+backdrop_imagefilter_croprect,-1
+backdrop_imagefilter_croprect_nested,-1
+backdrop_imagefilter_croprect_persp,0
+backdrop_imagefilter_croprect_rotated,-1
+badpaint,-1
+bezier_conic_effects,-1
+bezier_quad_effects,-1
+beziers,-1
+big_rrect_circle_aa_effect,-1
+big_rrect_circular_corner_aa_effect,-1
+big_rrect_ellipse_aa_effect,-1
+big_rrect_elliptical_corner_aa_effect,-1
+big_rrect_rect_aa_effect,-1
+bigblurs,-1
+bigmatrix,-1
+bigrect,-1
+bigtext,-1
+bigtileimagefilter,-1
+bitmap-image-srgb-legacy,0
+bitmap_premul,0
+bitmap_subset_shader,-1
+bitmapcopy,0
+bitmapfilters,-1
+bitmaprect_i,-1
+bitmaprect_rounding,0
+bitmaprect_s,-1
+bitmaprecttest,0
+bitmapshaders,0
+bitmaptiled_fractional_horizontal,-1
+bitmaptiled_fractional_vertical,-1
+bleed,-1
+bleed_alpha_bmp,-1
+bleed_alpha_bmp_shader,-1
+bleed_alpha_image,-1
+bleed_alpha_image_shader,-1
+bleed_downscale,0
+bleed_image,-1
+blend,0
+blob_rsxform,0
+blur2rects,-1
+blur2rectsnonninepatch,0
+blurSmallRadii,0
+blur_ignore_xform_circle,-1
+blur_ignore_xform_rect,-1
+blur_ignore_xform_rrect,-1
+blur_image,-1
+blurcircles,-1
+blurimagevmask,-1
+blurquickreject,-1
+blurrect_compare,0
+blurrect_gallery,0
+blurrects,-1
+blurredclippedcircle,-1
+blurs,-1
+bmp_filter_quality_repeat,-1
+bug339297,0
+bug5099,-1
+bug5252,-1
+bug530095,-1
+bug583299,0
+bug591993,0
+bug593049,0
+bug615686,-1
+bug6643,0
+bug6783,0
+bug6987,-1
+bug7792,0
+bug9331,0
+c_gms,-1
+check_small_sigma_offset,0
+chrome_gradtext1,0
+chrome_gradtext2,-1
+circle_sizes,-1
+circles,-1
+circular-clips,-1
+circular_arcs_fill,-1
+circular_arcs_hairline,-1
+circular_arcs_stroke_and_fill_butt,-1
+circular_arcs_stroke_and_fill_round,-1
+circular_arcs_stroke_and_fill_square,-1
+circular_arcs_stroke_butt,-1
+circular_arcs_stroke_round,-1
+circular_arcs_stroke_square,-1
+circular_arcs_weird,-1
+clamped_gradients,-1
+clamped_gradients_nodither,-1
+clip_region,0
+clip_strokerect,-1
+clipcubic,-1
+clipdrawdraw,0
+cliperror,0
+clipped-bitmap-shaders-clamp,0
+clipped-bitmap-shaders-clamp-hq,0
+clipped-bitmap-shaders-mirror,0
+clipped-bitmap-shaders-mirror-hq,0
+clipped-bitmap-shaders-tile,0
+clipped-bitmap-shaders-tile-hq,0
+clippedcubic,0
+clippedcubic2,-1
+clockwise,-1
+collapsepaths,-1
+color4f,0
+color4shader,0
+colorcomposefilter_alpha,0
+colorcomposefilter_wacky,-1
+coloremoji,-1
+coloremoji_blendmodes,0
+colorfilteralpha8,0
+colorfilterimagefilter,0
+colorfilterimagefilter_layer,0
+colorwheel,0
+colorwheelnative,0
+combinemaskfilter,0
+combo-patheffects,-1
+compare_atlas_vertices,0
+complexclip2,0
+complexclip2_path_aa,-1
+complexclip2_path_bw,0
+complexclip2_rect_aa,-1
+complexclip2_rrect_aa,-1
+complexclip2_rrect_bw,-1
+complexclip3_complex,-1
+complexclip3_simple,-1
+complexclip4_aa,-1
+complexclip4_bw,0
+complexclip_aa,-1
+complexclip_aa_invert,-1
+complexclip_aa_layer,-1
+complexclip_aa_layer_invert,-1
+complexclip_blur_tiled,0
+complexclip_bw,-1
+complexclip_bw_invert,-1
+complexclip_bw_layer,-1
+complexclip_bw_layer_invert,-1
+composeshader,0
+composeshader_alpha,0
+composeshader_bitmap,0
+composeshader_bitmap2,0
+composeshader_bitmap_lm,0
+compositor_quads_color,-1
+compositor_quads_debug,-1
+compositor_quads_filter,-1
+compositor_quads_image,-1
+compositor_quads_shader,-1
+concavepaths,-1
+conicpaths,-1
+const_color_processor,-1
+contour_start,-1
+convex-lineonly-paths,-1
+convex-lineonly-paths-stroke-and-fill,-1
+convex-polygon-inset,-1
+convex_poly_clip,-1
+convex_poly_effect,-1
+convexpaths,-1
+copyTo4444,0
+copy_on_write_retain,0
+copy_on_write_savelayer,0
+crbug_640176,-1
+crbug_691386,0
+crbug_788500,-1
+crbug_847759,-1
+crbug_884166,-1
+crbug_887103,-1
+crbug_888453,-1
+crbug_892988,-1
+crbug_899512,0
+crbug_905548,0
+crbug_908646,0
+crbug_913349,-1
+crbug_918512,0
+crbug_938592,0
+crbug_946965,-1
+crbug_947055,-1
+crbug_996140,-1
+croppedrects,0
+cross_context_image,-1
+cubicclosepath,-1
+cubicpath,-1
+daa,-1
+dash_line_zero_off_interval,-1
+dashcircle,-1
+dashcircle2,-1
+dashcubics,-1
+dashing,-1
+dashing2,-1
+dashing3,-1
+dashing4,-1
+dashing5_aa,-1
+dashing5_bw,-1
+dashtextcaps,-1
+degenerate_gradients,0
+degeneratesegments,-1
+dftext,-1
+dftext_blob_persp,-1
+discard,-1
+displacement,-1
+distantclip,0
+dont_clip_to_layer,-1
+downsamplebitmap_checkerboard_high,-1
+downsamplebitmap_checkerboard_low,-1
+downsamplebitmap_checkerboard_medium,-1
+downsamplebitmap_checkerboard_none,-1
+downsamplebitmap_image_high,-1
+downsamplebitmap_image_low,-1
+downsamplebitmap_image_medium,-1
+downsamplebitmap_image_none,-1
+downsamplebitmap_text_high,-1
+downsamplebitmap_text_low,-1
+downsamplebitmap_text_medium,-1
+downsamplebitmap_text_none,-1
+draw-atlas,-1
+draw-atlas-colors,0
+drawTextRSXform,-1
+draw_bitmap_rect_skbug4734,0
+draw_image_set,-1
+draw_image_set_rect_to_rect,-1
+draw_quad_set,-1
+drawable,-1
+drawbitmaprect-imagerect-subset,-1
+drawbitmaprect-subset,-1
+drawminibitmaprect,-1
+drawminibitmaprect_aa,-1
+drawregion,0
+drawregionmodes,-1
+dropshadowimagefilter,-1
+drrect,-1
+drrect_small_inner,-1
+dstreadshuffle,-1
+emboss,-1
+emptypath,-1
+emptystroke,0
+encode,0
+encode-alpha-jpeg,0
+encode-platform,0
+encode-srgb-jpg,0
+encode-srgb-png,0
+encode-srgb-webp,0
+extractalpha,0
+extractbitmap,0
+fadefilter,0
+fancy_gradients,-1
+fancyblobunderline,-1
+fast_slow_blurimagefilter,0
+fatpathfill,-1
+fiddle,0
+fillcircle,-1
+filltypes,-1
+filltypespersp,-1
+filterbitmap_checkerboard_192_192,-1
+filterbitmap_checkerboard_32_2,-1
+filterbitmap_checkerboard_32_32,-1
+filterbitmap_checkerboard_32_32_g8,-1
+filterbitmap_checkerboard_32_8,-1
+filterbitmap_checkerboard_4_4,-1
+filterbitmap_image_color_wheel.png,-1
+filterbitmap_image_mandrill_128.png,-1
+filterbitmap_image_mandrill_16.png,-1
+filterbitmap_image_mandrill_256.png,-1
+filterbitmap_image_mandrill_32.png,-1
+filterbitmap_image_mandrill_512.png,-1
+filterbitmap_image_mandrill_64.png,-1
+filterbitmap_image_mandrill_64.png_g8,-1
+filterbitmap_text_10.00pt,-1
+filterbitmap_text_3.00pt,-1
+filterbitmap_text_7.00pt,-1
+filterbug,-1
+filterfastbounds,-1
+filterindiabox,-1
+flippity,-1
+fontcache,-1
+fontcache-mt,-1
+fontmgr_bounds,-1
+fontmgr_bounds_0.75_0,-1
+fontmgr_bounds_1_-0.25,-1
+fontmgr_iter,0
+fontmgr_match,0
+fontregen,-1
+fontscaler,-1
+fontscalerdistortable,-1
+format4444,0
+fpcoordinateoverride,-1
+fwidth_squircle,-1
+gamma,-1
+gammagradienttext,0
+gammatext,0
+getpostextpath,-1
+giantbitmap_clamp_bilerp_rotate,-1
+giantbitmap_clamp_bilerp_scale,-1
+giantbitmap_clamp_point_rotate,0
+giantbitmap_clamp_point_scale,0
+giantbitmap_mirror_bilerp_rotate,-1
+giantbitmap_mirror_bilerp_scale,-1
+giantbitmap_mirror_point_rotate,0
+giantbitmap_mirror_point_scale,0
+giantbitmap_repeat_bilerp_rotate,-1
+giantbitmap_repeat_bilerp_scale,-1
+giantbitmap_repeat_point_rotate,0
+giantbitmap_repeat_point_scale,0
+glyph_pos_h_b,-1
+glyph_pos_h_f,-1
+glyph_pos_h_s,-1
+glyph_pos_n_b,-1
+glyph_pos_n_f,-1
+glyph_pos_n_s,-1
+gpusamplerstress,0
+gradient_dirty_laundry,-1
+gradient_many_stops,0
+gradient_matrix,0
+gradients,-1
+gradients4f,-1
+gradients4f_nodither,-1
+gradients_2pt_conical_edge,-1
+gradients_2pt_conical_edge_mirror,-1
+gradients_2pt_conical_edge_nodither,-1
+gradients_2pt_conical_edge_repeat,-1
+gradients_2pt_conical_inside,-1
+gradients_2pt_conical_inside_mirror,-1
+gradients_2pt_conical_inside_nodither,-1
+gradients_2pt_conical_inside_repeat,-1
+gradients_2pt_conical_outside,-1
+gradients_2pt_conical_outside_mirror,-1
+gradients_2pt_conical_outside_nodither,-1
+gradients_2pt_conical_outside_repeat,-1
+gradients_degenerate_2pt,-1
+gradients_degenerate_2pt_nodither,-1
+gradients_dup_color_stops,-1
+gradients_interesting,0
+gradients_local_perspective,-1
+gradients_local_perspective_nodither,-1
+gradients_many,0
+gradients_many_nodither,0
+gradients_no_texture,-1
+gradients_no_texture_nodither,-1
+gradients_nodither,-1
+gradients_view_perspective,-1
+gradients_view_perspective_nodither,-1
+grayscalejpg,0
+hairlines,-1
+hairmodes,-1
+hardstop_gradients,0
+highcontrastfilter,0
+hittestpath,-1
+hsl,-1
+hslcolorfilter,-1
+hugebitmapshader,-1
+image-cacherator-from-picture,-1
+image-cacherator-from-raster,-1
+image-cacherator-from-texture,-1
+image-picture,-1
+image-shader,-1
+image-surface,0
+image_from_yuv_textures,-1
+image_scale_aligned,-1
+image_subset,0
+imagealphathreshold,-1
+imagealphathreshold_crop,0
+imagealphathreshold_image,-1
+imagealphathreshold_surface,0
+imageblur,-1
+imageblur_large,0
+imageblurrepeatmode,0
+imageblurtiled,0
+imagefilters_xfermodes,-1
+imagefiltersbase,-1
+imagefiltersclipped,-1
+imagefilterscropexpand,-1
+imagefilterscropped,-1
+imagefiltersscaled,-1
+imagefiltersstroked,-1
+imagefilterstransformed,-1
+imagemagnifier,-1
+imagemagnifier_cropped,-1
+imagemakewithfilter,-1
+imagemakewithfilter_crop,-1
+imagemakewithfilter_crop_ref,-1
+imagemakewithfilter_ref,-1
+imagemasksubset,0
+imageresizetiled,-1
+imagesource,-1
+imagesrc2_high,0
+imagesrc2_low,-1
+imagesrc2_med,0
+imagesrc2_none,0
+innershapes,-1
+innershapes_bw,-1
+internal_links,-1
+inverse_paths,-1
+inverseclip,-1
+jpg-color-cube,0
+labyrinth_butt,0
+labyrinth_round,-1
+labyrinth_square,0
+largecircle,-1
+largeovals,-1
+lattice,-1
+lattice2,0
+lattice_alpha,0
+lcdblendmodes,0
+lcdoverlap,-1
+lcdtext,0
+lcdtextsize,0
+lighting,-1
+lightingcolorfilter,0
+lightingshader,0
+lightingshader2,-1
+linear_gradient,0
+linear_gradient_nodither,0
+linear_gradient_tiny,0
+lineclosepath,-1
+linepath,-1
+localmatriximagefilter,0
+localmatriximageshader,0
+localmatriximageshader_filtering,0
+localmatrixshader_nested,-1
+longlinedash,0
+longpathdash,-1
+longwavyline,-1
+lumafilter,-1
+macaa_colors,-1
+maddash,-1
+makeRasterImage,0
+makecolorspace,0
+makecolortypeandspace,0
+mandoline,-1
+manyarcs,-1
+manycircles,-1
+manyrrects,-1
+matrixconvolution,-1
+matrixconvolution_color,-1
+matriximagefilter,-1
+mipmap,-1
+mipmap_gray8_srgb,0
+mipmap_srgb,0
+mixedtextblobs,-1
+mixerCF,0
+mixershader,0
+mixershader2,0
+mixershader_shadermixer,-1
+modecolorfilters,0
+morphology,-1
+multipicturedraw_biglayer_simple,0
+multipicturedraw_biglayer_tiled,0
+multipicturedraw_invpathclip_simple,0
+multipicturedraw_invpathclip_tiled,0
+multipicturedraw_noclip_simple,0
+multipicturedraw_noclip_tiled,0
+multipicturedraw_pathclip_simple,0
+multipicturedraw_pathclip_tiled,0
+multipicturedraw_rectclip_simple,0
+multipicturedraw_rectclip_tiled,0
+multipicturedraw_rrectclip_simple,0
+multipicturedraw_rrectclip_tiled,0
+multipicturedraw_sierpinski_simple,0
+multipicturedraw_sierpinski_tiled,0
+nested_aa,-1
+nested_bw,0
+nested_flipY_aa,-1
+nested_flipY_bw,0
+new_texture_image,-1
+ninepatch-stretch,-1
+nonclosedpaths,-1
+not_native32_bitmap_config,0
+offsetimagefilter,0
+onebadarc,0
+ovals,-1
+overdraw_canvas,0
+overdrawcolorfilter,0
+p3_ovals,-1
+parsedpaths,-1
+patch_alpha,0
+patch_alpha_test,0
+patch_image,-1
+patch_primitive,0
+path-reverse,-1
+path_huge_aa,0
+path_huge_crbug_800804,-1
+path_mask_cache,-1
+patheffect,-1
+pathfill,-1
+pathinterior,-1
+pathinvfill,-1
+pathopsinverse,-1
+pathopsskpclip,-1
+pdf_crbug_772685,0
+pdf_never_embed,-1
+perlinnoise_localmatrix,0
+persp_images,-1
+persp_shaders_aa,-1
+persp_shaders_bw,-1
+picture_cull_rect,0
+picture_savelayer,0
+pictureimagefilter,-1
+pictureimagegenerator,0
+pictures,0
+pictureshader,-1
+pictureshader_localwrapper,-1
+pictureshadercache,0
+pictureshadertile,0
+pixel_snap_combo,-1
+pixel_snap_line,-1
+pixel_snap_point,-1
+pixel_snap_rect,-1
+points,-1
+poly2poly,-1
+polygons,-1
+poster_circle,-1
+preservefillrule_big,-1
+preservefillrule_little,-1
+quadcap,-1
+quadclosepath,-1
+quadpath,-1
+radial_gradient,0
+radial_gradient2,0
+radial_gradient2_nodither,0
+radial_gradient3,0
+radial_gradient3_nodither,0
+radial_gradient4,-1
+radial_gradient4_nodither,-1
+rasterallocator,0
+readpixelscodec,-1
+readpixelspicture,-1
+recordopts,0
+rectangle_texture,-1
+rects,-1
+reinterpretcolorspace,0
+repeated_bitmap,0
+repeated_bitmap_jpg,-1
+resizeimagefilter,-1
+rotate_imagefilter,-1
+rotatedcubicpath,-1
+roundrects,-1
+rrect,-1
+rrect_clip_aa,-1
+rrect_clip_bw,0
+rrect_clip_draw_paint,-1
+rrect_draw_aa,-1
+rrect_draw_bw,0
+rrect_effect,-1
+runtime_cf_interp_1,0
+runtime_shader,0
+runtimecolorfilter,-1
+runtimecolorfilter_interpreted,-1
+runtimefunctions,0
+samplelocations_hwgrad_botleft,-1
+samplelocations_hwgrad_topleft,-1
+samplelocations_swgrad_botleft,-1
+samplelocations_swgrad_topleft,-1
+save_behind,0
+savelayer_clipmask,-1
+savelayer_clipmask_maskfilter,0
+savelayer_coverage,-1
+savelayer_f16,-1
+savelayer_initfromprev,-1
+savelayer_maskfilter,-1
+savelayer_unclipped,0
+savelayer_with_backdrop,-1
+scale-pixels,0
+scaled_tilemode_bitmap,0
+scaled_tilemode_gradient,0
+scaled_tilemodes_npot,-1
+scaledemoji_rendering,0
+scaledstrokes,-1
+scalepixels_unpremul,0
+shadermaskfilter_gradient,-1
+shadermaskfilter_image,-1
+shadermaskfilter_localmatrix,-1
+shadertext3,-1
+shadow_utils,-1
+shadow_utils_gray,-1
+shadow_utils_occl,-1
+shallow_angle_path_arcto,0
+shallow_gradient_conical,0
+shallow_gradient_conical_nodither,0
+shallow_gradient_linear,0
+shallow_gradient_linear_nodither,0
+shallow_gradient_radial,0
+shallow_gradient_radial_nodither,0
+shallow_gradient_sweep,0
+shallow_gradient_sweep_nodither,0
+sharedcorners,-1
+showmiplevels2_255x255,0
+showmiplevels2_255x256,0
+showmiplevels2_256x255,0
+showmiplevels2_256x256,0
+showmiplevels_255,0
+showmiplevels_256,0
+simple-magnification,-1
+simple-offsetimagefilter,-1
+simple-polygon-offset,-1
+simpleaaclip_aaclip,0
+simpleaaclip_path,-1
+simpleaaclip_rect,-1
+simpleblurroundrect,-1
+simplerect,-1
+simpleshapes,-1
+simpleshapes_bw,0
+skbug_257,-1
+skbug_4868,-1
+skbug_5321,0
+skbug_8664,-1
+skbug_8955,0
+skbug_9319,-1
+skinning,-1
+skinning_cached,-1
+skinning_cpu,-1
+skinning_cpu_cached,-1
+skottie_colorize,-1
+skottie_multiframe,-1
+skottie_webfont,-1
+small_color_stop,-1
+smallarc,-1
+smallpaths,-1
+spritebitmap,0
+squarehair,-1
+srgb_colorfilter,0
+stlouisarch,-1
+stringart,-1
+stroke-fill,-1
+stroke_rect_shader,-1
+strokecircle,-1
+strokedlines,-1
+strokerect,-1
+strokerect_anisotropic_5408,0
+strokerects,-1
+strokes3,-1
+strokes_poly,-1
+strokes_round,-1
+strokes_zoomed,0
+stroketext,-1
+surface_underdraw,0
+surfacenew,0
+surfaceprops,0
+sweep_tiling,-1
+tablecolorfilter,0
+tall_stretched_bitmaps,-1
+teenyStrokes,-1
+testgradient,-1
+text_scale_skew,-1
+textblob,-1
+textblobblockreordering,0
+textblobcolortrans,0
+textblobgeometrychange,-1
+textbloblooper,-1
+textblobmixedsizes,-1
+textblobmixedsizes_df,-1
+textblobrandomfont,-1
+textblobshader,-1
+textblobtransforms,-1
+textblobuseaftergpufree,-1
+textfilter_color,0
+textfilter_image,0
+texture_domain_effect,-1
+texture_domain_effect_bilerp,-1
+texture_domain_effect_mipmap,-1
+thinconcavepaths,-1
+thinrects,-1
+thinstrokedrects,-1
+tiled_picture_shader,0
+tiledscaledbitmap,-1
+tileimagefilter,-1
+tilemode_bitmap,0
+tilemode_decal,-1
+tilemode_gradient,-1
+tilemodes,-1
+tilemodes_alpha,0
+tilemodes_npot,-1
+tinyanglearcs,-1
+tinybitmap,0
+transparency_check,0
+trickycubicstrokes,-1
+trimpatheffect,-1
+typefacerendering,-1
+typefacerendering_pfa,-1
+typefacerendering_pfb,-1
+typefacestyles,0
+typefacestyles_kerning,-1
+unpremul,0
+varied_text_clipped_lcd,-1
+varied_text_clipped_no_lcd,-1
+varied_text_ignorable_clip_lcd,-1
+varied_text_ignorable_clip_no_lcd,-1
+vertices,-1
+vertices_batching,-1
+vertices_scaled_shader,-1
+verylarge_picture_image,-1
+verylargebitmap,-1
+wacky_yuv_formats,0
+wacky_yuv_formats_cs,0
+wacky_yuv_formats_domain,0
+windowrectangles,-1
+windowrectangles_mask,-1
+xfermodeimagefilter,-1
+xfermodes,-1
+xfermodes3,0
+yuv_make_color_space,-1
+yuv_nv12_to_rgb_effect,-1
+yuv_splitter,0
+yuv_to_rgb_domain_effect,-1
+yuv_to_rgb_effect,-1
+zeroPath,-1
+zero_control_stroke,-1
+zero_length_paths_bw,-1
+zero_length_paths_dbl_aa,-1
+zero_length_paths_dbl_bw,-1
+zerolinedash,0
+zerolinestroke,-1
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
new file mode 100644
index 0000000..1e1b0d9
--- /dev/null
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
@@ -0,0 +1,227 @@
+AbandonedContextImage
+AdvancedBlendTest
+ApplyGamma
+AsyncReadPixels
+AsyncReadPixelsContextShutdown
+BasicDrawOpAtlas
+BlurMaskBiggerThanDest
+CCPR_busyPath
+CCPR_cache_animationAtlasReuse
+CCPR_cache_deferredCleanup
+CCPR_cache_hashTable
+CCPR_cache_mostlyVisible
+CCPR_cache_multiFlush
+CCPR_cache_multiTileCache
+CCPR_cache_partialInvalidate
+CCPR_cache_recycleEntries
+CCPR_cleanup
+CCPR_cleanupWithTexAllocFail
+CCPR_parseEmptyPath
+CCPR_unrefPerOpsTaskPathsBeforeOps
+CCPR_unregisterCulledOps
+CharacterizationBackendAllocationTest
+ClearOp
+ClipMaskCache
+ColorTypeBackendAllocationTest
+ComposedImageFilterBounds_Gpu
+ComposedImageFilterOffset_Gpu
+CopySurface
+DDLCompatibilityTest
+DDLFlushWhileRecording
+DDLInvalidRecorder
+DDLMakeRenderTargetTest
+DDLMultipleDDLs
+DDLNonTextureabilityTest
+DDLOperatorEqTest
+DDLSkSurfaceFlush
+DDLSurfaceCharacterizationTest
+DDLTextureFlagsTest
+DDLWrapBackendTest
+DeferredProxyTest
+DefferredProxyConversionTest
+DetermineDomainModeTest
+EGLImageTest
+ES2BlendWithNoTexture
+EmptySurfaceSemaphoreTest
+ExtendedSkColorTypeTests_gpu
+FlushFinishedProcTest
+FullScreenClearWithLayers
+GLBackendAllocationTest
+GLTextureParameters
+GPUMemorySize
+GpuDrawPath
+GpuRectanizer
+Gr1x1TextureMipMappedTest
+GrAtlasTextOpPreparation
+GrBackendTextureImageMipMappedTest
+GrClipBounds
+GrContextFactory_abandon
+GrContextFactory_executorAndTaskGroup
+GrContextFactory_sharedContexts
+GrContext_abandonContext
+GrContext_colorTypeSupportedAsImage
+GrContext_colorTypeSupportedAsSurface
+GrContext_maxSurfaceSamplesForColorType
+GrDefaultPathRendererTest
+GrDrawCollapsedPath
+GrDrawOpAtlasConfig_Basic
+GrImageSnapshotMipMappedTest
+GrManyDependentsMipMappedTest
+GrMeshTest
+GrOpsTaskFlushCount
+GrPathKeys
+GrPipelineDynamicStateTest
+GrPorterDuff
+GrSurface
+GrSurfaceRenderability
+GrTRecorder
+GrTestingBackendTextureUploadTest
+GrTextureMipMapInvalidationTest
+GrUploadPixelsTests
+GrWrappedMipMappedTest
+HalfFloatAlphaTextureTest
+HalfFloatRGBATextureTest
+ImageEncode_Gpu
+ImageFilterBlurLargeImage_Gpu
+ImageFilterCache_GPUBacked
+ImageFilterCache_ImageBackedGPU
+ImageFilterClippedPictureImageFilter_Gpu
+ImageFilterCropRect_Gpu
+ImageFilterFailAffectsTransparentBlack_Gpu
+ImageFilterHugeBlur_Gpu
+ImageFilterMakeWithFilter_Gpu
+ImageFilterMatrixConvolutionBigKernel_Gpu
+ImageFilterMergeResultSize_Gpu
+ImageFilterNegativeBlurSigma_Gpu
+ImageFilterZeroBlurSigma_Gpu
+ImageFlush
+ImageIsOpaqueTest_Gpu
+ImageLegacyBitmap_Gpu
+ImageNewShader_GPU
+ImagePeek_Gpu
+ImageReadPixels_Gpu
+ImageScalePixels_Gpu
+InitialTextureClear
+LazyProxyFailedInstantiationTest
+LazyProxyReleaseTest
+LazyProxyTest
+LegacyAsyncReadPixels
+MorphologyFilterRadiusWithMirrorCTM_Gpu
+OnFlushCallbackTest
+OpChainTest
+OverbudgetFlush
+OverdrawSurface_Gpu
+PinnedImageTest
+PorterDuffNoDualSourceBlending
+PreinstantiatedProxyConversionTest
+PremulAlphaRoundTrip_Gpu
+ProcessorCloneTest
+ProcessorOptimizationValidationTest
+ProcessorRefTest
+Programs
+PromiseImageNullFulfill
+PromiseImageTest
+PromiseImageTextureFullCache
+PromiseImageTextureReuseDifferentConfig
+PromiseImageTextureShutdown
+ProxyRefTest
+RGB565TextureTest
+RGBA4444TextureTest
+ReadOnlyTexture
+ReadPixels_Gpu
+ReadPixels_Texture
+ReadWriteAlpha
+RectangleTexture
+ReimportImageTextureWithMipLevels
+RenderTargetContextTest
+RepeatedClippedBlurTest
+ReplaceSurfaceBackendTexture
+ResourceAllocatorCurOpsTaskIndexTest
+ResourceAllocatorOverBudgetTest
+ResourceAllocatorStressTest
+ResourceAllocatorTest
+ResourceCacheCache
+ResourceCacheMisc
+ResourceCacheStencilBuffers
+ResourceCacheWrappedResources
+ResourceMessagesAfterAbandon
+SRGBReadWritePixels
+SkImage_CrossContextGrayAlphaConfigs
+SkImage_Gpu2Cpu
+SkImage_MakeCrossContextFromPixmapRelease
+SkImage_NewFromTextureRelease
+SkImage_makeNonTextureImage
+SkImage_makeTextureImage
+SkRemoteGlyphCache_CacheMissReporting
+SkRemoteGlyphCache_DrawTextAsDFT
+SkRemoteGlyphCache_DrawTextAsMaskWithPathFallback
+SkRemoteGlyphCache_DrawTextAsPath
+SkRemoteGlyphCache_DrawTextXY
+SkRemoteGlyphCache_ReleaseTypeFace
+SkRemoteGlyphCache_StrikeSerialization
+SkRemoteGlyphCache_TypefaceWithNoPaths
+SkTraceMemoryDump_ownedGLBuffer
+SkTraceMemoryDump_ownedGLRenderTarget
+SkTraceMemoryDump_ownedGLTexture
+SkTraceMemoryDump_unownedGLRenderTarget
+SkTraceMemoryDump_unownedGLTexture
+SmallBoxBlurBug
+SoftwarePathRendererCacheTest
+SpecialImage_GPUDevice
+SpecialImage_Gpu
+SpecialImage_MakeTexture
+SpecialImage_ReadbackAndCachingSubsets_Gpu
+SpecialSurface_Gpu1
+SurfaceAttachStencil_Gpu
+SurfaceBackendHandleAccessIDs_Gpu
+SurfaceBackendSurfaceAccessCopyOnWrite_Gpu
+SurfaceBudget
+SurfaceCRBug263329_Gpu
+SurfaceCanvasPeek_Gpu
+SurfaceClear_Gpu
+SurfaceCopyOnWrite_Gpu
+SurfaceEmpty_Gpu
+SurfaceNoCanvas_Gpu
+SurfacePartialDraw_Gpu
+SurfaceSemaphores
+SurfaceSnapshotAlphaType_Gpu
+SurfaceWrappedWithRelease_Gpu
+SurfaceWriteableAfterSnapshotRelease_Gpu
+SurfacepeekTexture_Gpu
+TessellatingPathRendererCacheTest
+TessellatingPathRendererTests
+TestGpuAllContexts
+TestGpuFactory
+TestGpuRenderingContexts
+TestMockContext
+TextBlobAbnormal
+TextBlobCache
+TextBlobJaggedGlyph
+TextBlobSmoothScroll
+TextBlobStressAbnormal
+TextBlobStressCache
+TextureBindingsResetTest
+TextureIdleProcCacheManipulationTest
+TextureIdleProcFlushTest
+TextureIdleProcRerefTest
+TextureIdleProcTest
+TextureIdleStateTest
+TextureProxyTest
+TextureStripAtlasManagerColorFilterTest
+TextureStripAtlasManagerGradientTest
+TransferPixelsFromTest
+TransferPixelsToTest
+UnpremulTextureImage
+VertexAttributeCount
+WrappedProxyTest
+WritePixelsMSAA_Gpu
+WritePixelsNonTextureMSAA_Gpu
+WritePixelsNonTexture_Gpu
+WritePixelsPendingIO
+WritePixels_Gpu
+XfermodeImageFilterCroppedInput_Gpu
+ZeroSizedProxyTest
+canvas_private_clipRgn
+makeBackendTexture
+skbug5221_GPU
+skbug6653
diff --git a/tools/skqp/bad_gms.txt b/tools/skqp/bad_gms.txt
index 7e7bf51..551ba44 100644
--- a/tools/skqp/bad_gms.txt
+++ b/tools/skqp/bad_gms.txt
@@ -1,11 +1,35 @@
 arcs_as_paths
+atlastext
+bigbitmaprect_i
+bigbitmaprect_s
+blurcircles2
+bug339297_as_clip
+bug6083
+colorfiltershader
+colormatrix
+composeshader_grid
 drawbitmaprect
 drawbitmaprect-imagerect
 etc1
+gradtext
+imageblur2
+imageblurclampmode
+imagefiltersgraph
+largeglyphblur
+megalooper_0x0
+megalooper_1x4
+megalooper_4x1
+orientation
 ovals_as_paths
 p3
 perlinnoise
 radial_gradient_precision
 readpixels
+scaled_tilemodes
+scaledemoji
+scaledemojipos
 skbug1719
+srcmode
+textblob_intercepts
+xfermodes2
 zero_length_paths_aa