diff --git a/common.gypi b/common.gypi index 95f1cbb88..af4c0911f 100644 --- a/common.gypi +++ b/common.gypi @@ -1458,7 +1458,13 @@ 'conditions': [ ['OS=="android"', { # We directly set the gcc versions since we know what we use. - 'gcc_version%': 48, + 'conditions': [ + ['target_arch=="x64" or target_arch=="arm64"', { + 'gcc_version%': 48, + }, { + 'gcc_version%': 46, + }], + ], }, { 'gcc_version%': '= 48) { - # Don't warn about the "typedef 'foo' locally defined but not used" - # for gcc 4.8. - # TODO: remove this flag once all builds work. See crbug.com/227506 - cflags += [ - "-Wno-unused-local-typedefs", - ] - } } } @@ -796,3 +776,4 @@ config("no_symbols") { cflags = [ "-g0" ] } } +