summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-28 12:35:08 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-11-28 20:10:26 +0200
commit7473e6639fe612c4d8448df1103c64aa0873f7b5 (patch)
tree257a27fd142fb67e36cf819eaf17f8664c5d6f5e
parente3d1daaf6687467ee5c064d2577d2903c508c2dc (diff)
downloadqtlocation-mapboxgl-upstream/tmpsantos-icf_all.tar.gz
[android] Use icf=allupstream/tmpsantos-icf_all
Chromium is using it for a while on ARM. https://codereview.chromium.org/1153143004/patch/20001/30002
-rw-r--r--metrics/tests/binary-size/android-arm64-v8a/metrics.json2
-rw-r--r--metrics/tests/binary-size/android-x86_64/metrics.json2
-rw-r--r--next/platform/android/android.cmake10
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 1aaf962875..960fa41232 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 7f0d9a2d84..4c093613ad 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 628a25515a..dcc12ecb39 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 $<$<CONFIG:Release>:-Oz -Qunused-arguments -flto>)
target_compile_options(mapbox-gl PRIVATE $<$<CONFIG:Release>:-Oz -Qunused-arguments -flto>)