diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:34:09 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:34:09 +0000 |
| commit | 996903c2b22b6300afcb7e5819dfd87558b2dbe8 (patch) | |
| tree | bf1f8149fc294d3351ad1fe468781334a1f6515f | |
| parent | fab8471bb1f2ef4c2d7f761c674d449b87dd0081 (diff) | |
| parent | 0242a91d97a70acbbf186678e636d99a565c0bf0 (diff) | |
| download | skqp-android10-mainline-networking-release.tar.gz | |
Snap for 6001391 from 0242a91d97a70acbbf186678e636d99a565c0bf0 to qt-aml-networking-releaseandroid-mainline-10.0.0_r6android10-mainline-networking-release
Change-Id: I94fb8ade7e7e3bc561f9bce1d5c05aa861a15609
| -rw-r--r-- | Android.bp | 1 | ||||
| -rwxr-xr-x | tools/skqp/gn_to_bp.py | 3 |
2 files changed, 3 insertions, 1 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/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') |