diff options
| author | Chidera Olibie <colibie@google.com> | 2024-04-10 10:47:28 +0000 |
|---|---|---|
| committer | Chidera Olibie <colibie@google.com> | 2024-04-15 17:26:35 +0000 |
| commit | ff30acec33372a73d3f0ad258e714a40c0261946 (patch) | |
| tree | 102e0986c5166ea293a55a064a0f90bf6acd16d9 | |
| parent | 8c25999a40b6131bf85efe1a5946181ecbe0c0dd (diff) | |
| download | cronet-ff30acec33372a73d3f0ad258e714a40c0261946.tar.gz | |
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
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | android/tools/gn2bp/Android.bp.swp | 3 | ||||
| -rwxr-xr-x | android/tools/gn2bp/gen_android_bp | 4 | ||||
| -rw-r--r-- | exclude_coverage.list | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 83bc09eda..8e5dbcb06 100644 --- a/Android.bp +++ b/Android.bp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// This file is automatically generated by gn2bp/gen_android_bp. Do not edit. +// This file is automatically generated by gen_android_bp. Do not edit. build = ["Android.extras.bp"] @@ -18627,6 +18627,7 @@ cc_defaults { "-Wno-unreachable-code-loop-increment", "-Wno-unused-parameter", "-fPIC", + "-fprofile-list=external/cronet/exclude_coverage.list", ], stl: "none", cpp_std: "c++17", diff --git a/android/tools/gn2bp/Android.bp.swp b/android/tools/gn2bp/Android.bp.swp index e6a7731a3..819899100 100644 --- a/android/tools/gn2bp/Android.bp.swp +++ b/android/tools/gn2bp/Android.bp.swp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -// This file is automatically generated by gn2bp/gen_android_bp. Do not edit. +// This file is automatically generated by gen_android_bp. Do not edit. build = ["Android.extras.bp"] @@ -18627,6 +18627,7 @@ cc_defaults { "-Wno-unreachable-code-loop-increment", "-Wno-unused-parameter", "-fPIC", + "-fprofile-list=external/cronet/exclude_coverage.list", ], stl: "none", cpp_std: "c++17", diff --git a/android/tools/gn2bp/gen_android_bp b/android/tools/gn2bp/gen_android_bp index 00b79cf92..401994851 100755 --- a/android/tools/gn2bp/gen_android_bp +++ b/android/tools/gn2bp/gen_android_bp @@ -1781,8 +1781,6 @@ def create_modules_from_target(blueprint, gn, gn_target_name, is_descendant_of_j if module.type == 'cc_library_static': module.export_generated_headers = module.generated_headers - - if module.name in ['cronet_aml_components_cronet_android_cronet', 'cronet_aml_components_cronet_android_cronet' + gn_utils.TESTING_SUFFIX]: if target.output_name is None: @@ -1924,6 +1922,8 @@ def create_blueprint_for_targets(gn, targets, test_targets): '-Wno-unreachable-code-loop-increment', # needed for icui18n '-fPIC', '-Wno-c++11-narrowing', + # b/330508686 disable coverage profiling for files or function in this list. + '-fprofile-list=external/cronet/exclude_coverage.list', ] defaults.c_std = 'gnu11' # Chromium builds do not add a dependency for headers found inside the diff --git a/exclude_coverage.list b/exclude_coverage.list new file mode 100644 index 000000000..dc1ef304b --- /dev/null +++ b/exclude_coverage.list @@ -0,0 +1,5 @@ +# Temporary disable coverage profiling for functions below due to b/330508686. +# TODO(b/332489473): Undo this once Mainline compiles in main. +[clang] +source:external/cronet/base/time/time.h=forbid +default:allow |