diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:07:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:07:41 +0000 |
| commit | 2c65d1bd2bbacefe98391c8205514efcf7847a10 (patch) | |
| tree | bf1f8149fc294d3351ad1fe468781334a1f6515f | |
| parent | 8b996ad2f0b74fecb34e5b2c154418201849e93e (diff) | |
| parent | 0242a91d97a70acbbf186678e636d99a565c0bf0 (diff) | |
| download | skqp-2c65d1bd2bbacefe98391c8205514efcf7847a10.tar.gz | |
Snap for 6001391 from 0242a91d97a70acbbf186678e636d99a565c0bf0 to qt-aml-tzdata-release
Change-Id: I13343dd26626489a5e240add64c73ff32a88a863
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt | 8 | ||||
| -rwxr-xr-x | tools/skqp/gn_to_bp.py | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index ae3406e566..9888fc739b 100644 --- a/Android.bp +++ b/Android.bp @@ -15,7 +15,6 @@ cc_library_shared { "-D_FORTIFY_SOURCE=1", "-Wall", "-Werror", - "-Weverything", "-Wextra", "-Winit-self", "-Wno-bad-function-cast", 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 index 9d5b0648e3..14fa55a3ae 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt +++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt @@ -121,7 +121,7 @@ clip_region,0 clip_strokerect,-1 clipcubic,-1 clipdrawdraw,0 -cliperror,0 +cliperror,3600 clipped-bitmap-shaders-clamp,0 clipped-bitmap-shaders-clamp-hq,0 clipped-bitmap-shaders-mirror,0 @@ -410,7 +410,7 @@ internal_links,-1 inverse_paths,-1 jpg-color-cube,0 largecircle,-1 -largeglyphblur,1 +largeglyphblur,3000 lattice,-1 lattice2,0 lattice_alpha,0 @@ -422,8 +422,8 @@ lighting,-1 lightingcolorfilter,0 lightingshader,0 lightingshader2,-1 -linear_gradient,0 -linear_gradient_nodither,0 +linear_gradient,110000 +linear_gradient_nodither,120000 linear_gradient_tiny,0 lineclosepath,-1 linepath,-1 diff --git a/tools/skqp/gn_to_bp.py b/tools/skqp/gn_to_bp.py index d6b84955da..920c8f0e8e 100755 --- a/tools/skqp/gn_to_bp.py +++ b/tools/skqp/gn_to_bp.py @@ -151,6 +151,9 @@ 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']) +# Android does not want -Weverything set, it blocks toolchain updates. +cflags.remove('-Weverything') + gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None) gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs', local_includes, 'freetype') |