Source release 16.4.0

oemcrypto/test/fuzz_tests/oemcrypto_fuzztests.gypi

@@ -62,6 +62,10 @@
         # Need -g flag to include source line numbers in error stack trace.
         '-g',
       ],
+      'ldflags': [
+        '-fPIC',
+        '-fsanitize=fuzzer,address,undefined',
+      ],
     }],
     ['generate_code_coverage_report=="true"', {
       # Include flags to build fuzzer binaries to generate source based code coverage reports.
@@ -70,12 +74,14 @@
         '-fprofile-instr-generate',
         '-fcoverage-mapping',
       ],
+      'ldflags': [
+        '-fPIC',
+        '-fsanitize=fuzzer,address,undefined',
+        '-fprofile-instr-generate',
+        '-fcoverage-mapping',
+      ],
     }],
   ],  # conditions
-  'ldflags': [
-    '-fPIC',
-    '-fsanitize=fuzzer,address,undefined',
-  ],
   'libraries': [
     '-lpthread',
   ],