diff options
| author | Colin Cross <ccross@android.com> | 2019-11-11 09:59:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-11 09:59:13 -0800 |
| commit | 0242a91d97a70acbbf186678e636d99a565c0bf0 (patch) | |
| tree | bf1f8149fc294d3351ad1fe468781334a1f6515f | |
| parent | 339d593267433ea5584a4187031e288bee7b62ea (diff) | |
| parent | 1308793d7c0366b327377ec98a0b47dc38866c27 (diff) | |
| download | skqp-0242a91d97a70acbbf186678e636d99a565c0bf0.tar.gz | |
Replace -Weverything with -Wextra am: 29cd4eca88
am: 1308793d7c
Change-Id: I4dd09b2a5afcbf452b5da551f8dc162d8f9beb40
| -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') |