From af0d46c367f206feb0f22e1c5d97b4b704a72499 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 28 Nov 2019 12:35:08 +0200 Subject: [PATCH] [android] Use icf=all Chromium is using it for a while on ARM. https://codereview.chromium.org/1153143004/patch/20001/30002 --- .../tests/binary-size/android-arm64-v8a/metrics.json | 2 +- metrics/tests/binary-size/android-x86_64/metrics.json | 2 +- next/platform/android/android.cmake | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metrics/tests/binary-size/android-arm64-v8a/metrics.json b/metrics/tests/binary-size/android-arm64-v8a/metrics.json index 1aaf96287..960fa4123 100644 --- a/metrics/tests/binary-size/android-arm64-v8a/metrics.json +++ b/metrics/tests/binary-size/android-arm64-v8a/metrics.json @@ -3,7 +3,7 @@ [ "android-arm64-v8a", "/src/workspace/next-android-arm64-v8a-release/lib/libmapbox-gl.so", - 1939896 + 1907875 ] ] } diff --git a/metrics/tests/binary-size/android-x86_64/metrics.json b/metrics/tests/binary-size/android-x86_64/metrics.json index 7f0d9a2d8..4c093613a 100644 --- a/metrics/tests/binary-size/android-x86_64/metrics.json +++ b/metrics/tests/binary-size/android-x86_64/metrics.json @@ -3,7 +3,7 @@ [ "android-x86_64", "/src/workspace/next-android-x86_64-release/lib/libmapbox-gl.so", - 1982007 + 1946541 ] ] } diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 628a25515..dcc12ecb3 100644 --- a/next/platform/android/android.cmake +++ b/next/platform/android/android.cmake @@ -381,11 +381,11 @@ add_custom_command( # Android has no concept of MinSizeRel on android.toolchain.cmake and provides configurations tuned for binary size. We can push it a bit # more with code folding and LTO. -set_target_properties(example-custom-layer PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") -set_target_properties(mapbox-gl PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") -set_target_properties(mbgl-benchmark-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") -set_target_properties(mbgl-render-test-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") -set_target_properties(mbgl-test-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") +set_target_properties(example-custom-layer PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=all") +set_target_properties(mapbox-gl PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=all") +set_target_properties(mbgl-benchmark-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=all") +set_target_properties(mbgl-render-test-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=all") +set_target_properties(mbgl-test-runner PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=all") target_compile_options(example-custom-layer PRIVATE $<$:-Oz -Qunused-arguments -flto>) target_compile_options(mapbox-gl PRIVATE $<$:-Oz -Qunused-arguments -flto>)