Skip to content

Commit

Permalink
Disable thinlto for Cronet builds
Browse files Browse the repository at this point in the history
Cronet tests assume no whole-program optimizations.

Bug: 1136962, 1136963
Change-Id: Iead196d725adcbaad4a64508f3e9c213d5c83d12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2463458
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817625}
  • Loading branch information
agrieve authored and Commit Bot committed Oct 15, 2020
1 parent 0546d27 commit 3350bae
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 11 deletions.
1 change: 1 addition & 0 deletions tools/mb/mb_config.pyl
Original file line number Diff line number Diff line change
Expand Up @@ -2629,6 +2629,7 @@
'use_hashed_jni_names=true '
'default_min_sdk_version=16 '
'clang_use_default_sample_profile=false '
'use_thin_lto=false '
'enable_resource_allowlist_generation=false'),
},

Expand Down
24 changes: 16 additions & 8 deletions tools/mb/mb_config_expectations/chromium.android.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-arm-rel": {
Expand All @@ -199,7 +200,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-arm64-dbg": {
Expand All @@ -223,7 +225,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-arm64-rel": {
Expand All @@ -249,7 +252,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-asan-arm-rel": {
Expand Down Expand Up @@ -277,7 +281,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-marshmallow-arm64-perf-rel": {
Expand All @@ -303,7 +308,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-x86-dbg": {
Expand All @@ -327,7 +333,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-x86-rel": {
Expand All @@ -353,7 +360,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-incremental-dbg": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-cronet-marshmallow-arm64-rel": {
Expand All @@ -105,7 +106,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android-deterministic-dbg": {
Expand Down Expand Up @@ -580,7 +582,8 @@
"use_goma": true,
"use_hashed_jni_names": true,
"use_partition_alloc": false,
"use_platform_icu_alternatives": true
"use_platform_icu_alternatives": true,
"use_thin_lto": false
}
},
"android_mojo": {
Expand Down

0 comments on commit 3350bae

Please sign in to comment.