Source release 16.3.0

oemcrypto/test/fuzz_tests/oemcrypto_fuzztests.gypi

@@ -1,48 +1,82 @@
 # Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
 #source code may only be used and distributed under the Widevine Master License
 #Agreement.
-#
-# Include this in any custom unit test targets.
-# Does not include the test runner main.
+
 {
+  'variables': {
+    'boringssl_libcrypto_path%': '../../../third_party/boringssl/boringssl.gyp:crypto',
+    'boringssl_libssl_path%': '../../../third_party/boringssl/boringssl.gyp:ssl',
+    'oemcrypto_dir': '../..',
+    'platform_specific_dir': '../../../linux/src',
+    'privacy_crypto_impl%': 'boringssl',
+    # Flag used to generate source based code coverage reports.
+    'generate_code_coverage_report%': 'false',
+    'util_dir': '../../../util',
+  },
   'sources': [
+    '../../odk/src/core_message_deserialize.cpp',
+    '../../odk/src/core_message_serialize.cpp',
     '../oec_device_features.cpp',
     '../oec_key_deriver.cpp',
+    '../oemcrypto_corpus_generator_helper.cpp',
     '../oec_session_util.cpp',
+    '../oemcrypto_corpus_generator_helper.cpp',
+    'oemcrypto_fuzz_helper.cc',
     '../oemcrypto_session_tests_helper.cpp',
-    '../oemcrypto_session_tests_helper.h',
-    '../../../cdm/test/device_cert.cpp',
-    '../../../cdm/test/device_cert.h',
+    '<(platform_specific_dir)/file_store.cpp',
+    '<(platform_specific_dir)/log.cpp',
+    '<(util_dir)/src/platform.cpp',
+    '<(util_dir)/src/rw_lock.cpp',
+    '<(util_dir)/src/string_conversions.cpp',
+    '<(util_dir)/test/test_sleep.cpp',
+    '<(util_dir)/test/test_clock.cpp',
   ],
   'include_dirs': [
-    '../../../core/include',  # log.h
-    '../../include',
-    '../../ref/src',  # oemcrypto_key_ref.h
-    '../',
-    '../../../cdm/test',
+    '../../../third_party/fuzz',
+    '<(util_dir)/include',
+    '<(util_dir)/test',
+    '<(oemcrypto_dir)/include',
+    '<(oemcrypto_dir)/ref/src',
+    '<(oemcrypto_dir)/test',
+    '<(oemcrypto_dir)/test/fuzz_tests',
+    '<(oemcrypto_dir)/odk/include',
+    '<(oemcrypto_dir)/odk/src',
   ],
-  'defines': [
-    'OEMCRYPTO_TESTS',
-    'OEMCRYPTO_FUZZ_TESTS',
-  ],
-  'libraries': [
-    '../../../third_party/fuzz/platforms/x86-64/libFuzzer.a',
+  'includes': [
+    '../../../util/libssl_dependency.gypi',
+    '../../ref/oec_ref.gypi',
   ],
   'dependencies': [
-    '../../../cdm/cdm.gyp:widevine_ce_cdm_shared',
-    '../../../third_party/gmock.gyp:gmock',
     '../../../third_party/gmock.gyp:gtest',
+    '../../../third_party/gmock.gyp:gmock',
+  ],
+  'defines': [
+    'OEMCRYPTO_FUZZ_TESTS',
   ],
   'conditions': [
-      ['oemcrypto_lib==""', {
-        'includes': [
-           '../../ref/oec_ref.gypi',
-        ],
-      }, {
-        'libraries': [
-          '../../../third_party/fuzz/platforms/x86-64/libFuzzer.a',
-          '<(oemcrypto_lib)',
-        ],
+    ['generate_code_coverage_report=="false"', {
+      # Include flags to build fuzzer binaries for cluster fuzz.
+      'cflags_cc': [
+        '-std=c++11',
+        '-fsanitize=fuzzer,address,undefined',
+        # Need -g flag to include source line numbers in error stack trace.
+        '-g',
+      ],
     }],
+    ['generate_code_coverage_report=="true"', {
+      # Include flags to build fuzzer binaries to generate source based code coverage reports.
+      'cflags_cc': [
+        '-std=c++11',
+        '-fprofile-instr-generate',
+        '-fcoverage-mapping',
+      ],
+    }],
+  ],  # conditions
+  'ldflags': [
+    '-fPIC',
+    '-fsanitize=fuzzer,address,undefined',
+  ],
+  'libraries': [
+    '-lpthread',
   ],
 }