AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce binary size of GCC Debug builds

Browse Source 
Change-Id: I2643a949d21bdacc7263f30d3a8b2ff9000929fc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265878
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
This commit is contained in:
Ben Wagner 2020-01-22 15:42:11 -05:00 committed by Skia Commit-Bot
parent 3a83392c9a
commit ba16336168
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infra/bots/recipe_modules/build/docker.py
View File

@ -65,6 +65,10 @@ def compile_fn(api, checkout_root, out_dir):
if os == 'Debian10' and compiler == 'GCC' and not extra_tokens:
args['cc'] = 'gcc'
args['cxx'] = 'g++'
# Newer GCC includes tons and tons of debugging symbols. This seems to
# negatively affect our bots (potentially only in combination with other
# bugs in Swarming or recipe code). Use g1 to reduce it a bit.
args['extra_cflags'].append('-g1')
if target_arch == 'x86_64':
image_name = 'gcc-debian10'
elif target_arch == 'x86':

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-loongson3a-Release-Docker.json
View File

@ -69,7 +69,7 @@
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-loongson3a-Release-Docker/Release,target=/OUT",
"gcr.io/skia-public/gcc-debian10-mips64el@sha256:c173a718d9f62f0cd1e5335713ebc4721d5dcf662fb02597744b71c53338a540",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"/usr/bin/mips64el-linux-gnuabi64-gcc-8\" cxx=\"/usr/bin/mips64el-linux-gnuabi64-g++-8\" extra_cflags=[\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10-mips64el@sha256:c173a718d9f62f0cd1e5335713ebc4721d5dcf662fb02597744b71c53338a540\"] extra_ldflags=[] is_debug=false target_cpu=\"loongson3a\" werror=true"
"cc=\"/usr/bin/mips64el-linux-gnuabi64-gcc-8\" cxx=\"/usr/bin/mips64el-linux-gnuabi64-g++-8\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10-mips64el@sha256:c173a718d9f62f0cd1e5335713ebc4721d5dcf662fb02597744b71c53338a540\"] extra_ldflags=[] is_debug=false target_cpu=\"loongson3a\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86-Debug-Docker.json
View File

@ -69,7 +69,7 @@
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86-Debug-Docker/Debug,target=/OUT",
"gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203\"] extra_ldflags=[] target_cpu=\"x86\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203\"] extra_ldflags=[] target_cpu=\"x86\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Debug-Docker.json
View File

@ -69,7 +69,7 @@
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Debug-Docker/Debug,target=/OUT",
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] target_cpu=\"x86_64\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker.json
View File

@ -69,7 +69,7 @@
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker/Release,target=/OUT",
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] is_debug=false skia_enable_gpu=false target_cpu=\"x86_64\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] is_debug=false skia_enable_gpu=false target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-Shared_Docker.json
View File

@ -69,7 +69,7 @@
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Release-Shared_Docker/Release,target=/OUT",
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] is_component_build=true is_debug=false target_cpu=\"x86_64\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DDUMMY_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] is_component_build=true is_debug=false target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/build/examples/full.expected/unknown-docker-image.json
View File

@ -21,7 +21,7 @@
" return func(*a, **kw)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/api.py\", line 61, in __call__",
" self.compile_fn(self.m, checkout_root, out_dir)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 78, in compile_fn",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 82, in compile_fn",
" raise Exception('Not implemented: ' + api.vars.builder_name)",
"Exception: Not implemented: Build-Unix-GCC-x86_64-Release-Docker"
]