Skip to content

Commit ff30ace

Browse files
committed
Revert "Revert "[Cronet] Exclude spaceship operator<=> from cove..."
Revert submission 3031237-revert_v3 Reason for revert: Fixed in this cl. The issue was caused by not having `default:allow` in the exclude_coverage.list Reverted changes: /q/submissionid:3031237-revert_v3 Change-Id: I2f8585c63e1a8ef35b5a256a5fecd8c69abd408e
1 parent 8c25999 commit ff30ace

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

Android.bp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414
//
15-
// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
15+
// This file is automatically generated by gen_android_bp. Do not edit.
1616

1717
build = ["Android.extras.bp"]
1818

@@ -18627,6 +18627,7 @@ cc_defaults {
1862718627
"-Wno-unreachable-code-loop-increment",
1862818628
"-Wno-unused-parameter",
1862918629
"-fPIC",
18630+
"-fprofile-list=external/cronet/exclude_coverage.list",
1863018631
],
1863118632
stl: "none",
1863218633
cpp_std: "c++17",

android/tools/gn2bp/Android.bp.swp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414
//
15-
// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
15+
// This file is automatically generated by gen_android_bp. Do not edit.
1616

1717
build = ["Android.extras.bp"]
1818

@@ -18627,6 +18627,7 @@ cc_defaults {
1862718627
"-Wno-unreachable-code-loop-increment",
1862818628
"-Wno-unused-parameter",
1862918629
"-fPIC",
18630+
"-fprofile-list=external/cronet/exclude_coverage.list",
1863018631
],
1863118632
stl: "none",
1863218633
cpp_std: "c++17",

android/tools/gn2bp/gen_android_bp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,8 +1781,6 @@ def create_modules_from_target(blueprint, gn, gn_target_name, is_descendant_of_j
17811781
if module.type == 'cc_library_static':
17821782
module.export_generated_headers = module.generated_headers
17831783

1784-
1785-
17861784
if module.name in ['cronet_aml_components_cronet_android_cronet',
17871785
'cronet_aml_components_cronet_android_cronet' + gn_utils.TESTING_SUFFIX]:
17881786
if target.output_name is None:
@@ -1924,6 +1922,8 @@ def create_blueprint_for_targets(gn, targets, test_targets):
19241922
'-Wno-unreachable-code-loop-increment', # needed for icui18n
19251923
'-fPIC',
19261924
'-Wno-c++11-narrowing',
1925+
# b/330508686 disable coverage profiling for files or function in this list.
1926+
'-fprofile-list=external/cronet/exclude_coverage.list',
19271927
]
19281928
defaults.c_std = 'gnu11'
19291929
# Chromium builds do not add a dependency for headers found inside the

exclude_coverage.list

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Temporary disable coverage profiling for functions below due to b/330508686.
2+
# TODO(b/332489473): Undo this once Mainline compiles in main.
3+
[clang]
4+
source:external/cronet/base/time/time.h=forbid
5+
default:allow

0 commit comments

Comments
 (0)