Skip to content

Commit 0057158

Browse files
committed
Revert "[Cronet] Exclude spaceship operator<=> from coverage profiliing"
This reverts commit b814a15. Change-Id: I49fde9aa307f300574eca3e9bd5d1ab365b597a4
1 parent c9f7393 commit 0057158

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

Android.bp

Lines changed: 3 additions & 4 deletions
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 gen_android_bp. Do not edit.
15+
// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
1616

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

@@ -5839,7 +5839,7 @@ cc_library_static {
58395839
cc_genrule {
58405840
name: "cronet_aml_base_build_date",
58415841
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
5842-
"1712072430",
5842+
"1705445157",
58435843
out: [
58445844
"base/generated_build_date.h",
58455845
],
@@ -5855,7 +5855,7 @@ cc_genrule {
58555855
cc_genrule {
58565856
name: "cronet_aml_base_build_date__testing",
58575857
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
5858-
"1712072430",
5858+
"1705445157",
58595859
host_supported: true,
58605860
out: [
58615861
"base/generated_build_date.h",
@@ -18627,7 +18627,6 @@ cc_defaults {
1862718627
"-Wno-unreachable-code-loop-increment",
1862818628
"-Wno-unused-parameter",
1862918629
"-fPIC",
18630-
"-fprofile-list=external/cronet/exclude_coverage.list",
1863118630
],
1863218631
stl: "none",
1863318632
cpp_std: "c++17",

android/tools/gn2bp/Android.bp.swp

Lines changed: 3 additions & 4 deletions
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 gen_android_bp. Do not edit.
15+
// This file is automatically generated by gn2bp/gen_android_bp. Do not edit.
1616

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

@@ -5839,7 +5839,7 @@ cc_library_static {
58395839
cc_genrule {
58405840
name: "cronet_aml_base_build_date",
58415841
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
5842-
"1712072430",
5842+
"1705445157",
58435843
out: [
58445844
"base/generated_build_date.h",
58455845
],
@@ -5855,7 +5855,7 @@ cc_genrule {
58555855
cc_genrule {
58565856
name: "cronet_aml_base_build_date__testing",
58575857
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
5858-
"1712072430",
5858+
"1705445157",
58595859
host_supported: true,
58605860
out: [
58615861
"base/generated_build_date.h",
@@ -18627,7 +18627,6 @@ cc_defaults {
1862718627
"-Wno-unreachable-code-loop-increment",
1862818628
"-Wno-unused-parameter",
1862918629
"-fPIC",
18630-
"-fprofile-list=external/cronet/exclude_coverage.list",
1863118630
],
1863218631
stl: "none",
1863318632
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,6 +1781,8 @@ 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+
17841786
if module.name in ['cronet_aml_components_cronet_android_cronet',
17851787
'cronet_aml_components_cronet_android_cronet' + gn_utils.TESTING_SUFFIX]:
17861788
if target.output_name is None:
@@ -1922,8 +1924,6 @@ def create_blueprint_for_targets(gn, targets, test_targets):
19221924
'-Wno-unreachable-code-loop-increment', # needed for icui18n
19231925
'-fPIC',
19241926
'-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: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)