[Cronet] Exclude spaceship operator<=> from coverage profiliing
clang-r487747c used for mainline build is breaks while trying
to compile the spaceship operator for coverage. This cl
disables that till Mainline updates clang or moves to main.
See b/330508686 for more.
- nit: also updated the build time. See b/332528730
Test: https://android-build.corp.google.com/abtd/run/L78500030002925385
Bug: b/330508686
Change-Id: Ic424ca3f4524068f3d5e191a07e7350768161e7e
diff --git a/Android.bp b/Android.bp
index e6a7731..8e5dbcb 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"]
@@ -5839,7 +5839,7 @@
cc_genrule {
name: "cronet_aml_base_build_date",
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
- "1705445157",
+ "1712072430",
out: [
"base/generated_build_date.h",
],
@@ -5855,7 +5855,7 @@
cc_genrule {
name: "cronet_aml_base_build_date__testing",
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
- "1705445157",
+ "1712072430",
host_supported: true,
out: [
"base/generated_build_date.h",
@@ -18627,6 +18627,7 @@
"-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 e6a7731..8e5dbcb 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"]
@@ -5839,7 +5839,7 @@
cc_genrule {
name: "cronet_aml_base_build_date",
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
- "1705445157",
+ "1712072430",
out: [
"base/generated_build_date.h",
],
@@ -5855,7 +5855,7 @@
cc_genrule {
name: "cronet_aml_base_build_date__testing",
cmd: "mkdir -p $(genDir)/base && $(location base/write_build_date_header.py) $(out) " +
- "1705445157",
+ "1712072430",
host_supported: true,
out: [
"base/generated_build_date.h",
@@ -18627,6 +18627,7 @@
"-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 00b79cf..4019948 100755
--- a/android/tools/gn2bp/gen_android_bp
+++ b/android/tools/gn2bp/gen_android_bp
@@ -1781,8 +1781,6 @@
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 @@
'-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 0000000..a4d1557
--- /dev/null
+++ b/exclude_coverage.list
@@ -0,0 +1,6 @@
+# Temporary disable coverage profiling for functions below due to b/330508686.
+# TODO(b/332489473): Undo this once Mainline compiles in main.
+[clang]
+fun:base::time_internal::operator<=>=forbid
+fun:base::operator<=>=forbid
+