Source release 17.1.0

oemcrypto/test/fuzz_tests/oemcrypto_fuzztests.gypi

@@ -1,5 +1,5 @@
 # Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-#source code may only be used and distributed under the Widevine Master License
+#source code may only be used and distributed under the Widevine License
 #Agreement.
 
 {
@@ -15,6 +15,7 @@
   },
   'sources': [
     '../../odk/src/core_message_deserialize.cpp',
+    '../../odk/src/core_message_features.cpp',
     '../../odk/src/core_message_serialize.cpp',
     '../oec_device_features.cpp',
     '../oec_key_deriver.cpp',
@@ -36,53 +37,84 @@
     '<(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',
+    '<(oemcrypto_dir)/opk/oemcrypto_ta',
   ],
   'includes': [
     '../../../util/libssl_dependency.gypi',
-    '../../ref/oec_ref.gypi',
   ],
   'dependencies': [
-    '../../../third_party/gmock.gyp:gtest',
-    '../../../third_party/gmock.gyp:gmock',
+    '../../../third_party/googletest.gyp:gtest',
+    '../../../third_party/googletest.gyp:gmock',
+    '<(oemcrypto_dir)/util/oec_ref_util.gyp:oec_ref_util',
   ],
   'defines': [
     'OEMCRYPTO_FUZZ_TESTS',
   ],
+  'cflags': [
+    '-fPIC',
+  ],
+  'cflags_c': [
+    '-std=c11',
+    '-D_POSIX_C_SOURCE=200809L',
+  ],
+  'cflags_cc': [
+    '-std=c++11',
+  ],
+  'ldflags': [
+    '-fPIC',
+  ],
+  'libraries': [
+    '-lpthread',
+  ],
   'conditions': [
     ['generate_code_coverage_report=="false"', {
       # Include flags to build fuzzer binaries for cluster fuzz.
-      'cflags_cc': [
-        '-std=c++11',
+      'cflags': [
+        '-O0',
+        '-fno-omit-frame-pointer',
+        '-U_FORTIFY_SOURCE',
         '-fsanitize=fuzzer,address,undefined',
+        '-fno-sanitize-recover=address,undefined',
         # Need -g flag to include source line numbers in error stack trace.
-        '-g',
+        '-g3',
+      ],
+      'cflags_cc' : [
+        '-frtti',
       ],
       'ldflags': [
-        '-fPIC',
-        '-fsanitize=fuzzer,address,undefined',
+        # Sanitizers with link-time components must be repeated here.
+        '-fsanitize=fuzzer,address',
       ],
     }],
     ['generate_code_coverage_report=="true"', {
       # Include flags to build fuzzer binaries to generate source based code coverage reports.
-      'cflags_cc': [
-        '-std=c++11',
+      'cflags': [
         '-fprofile-instr-generate',
         '-fcoverage-mapping',
       ],
       'ldflags': [
-        '-fPIC',
-        '-fsanitize=fuzzer,address,undefined',
+        '-fsanitize=fuzzer',
         '-fprofile-instr-generate',
         '-fcoverage-mapping',
       ],
     }],
+    ['oemcrypto_implementation_version=="reference"', {
+      # Include oemcrypto reference implementation code for building reference
+      # implementation fuzz binaries.
+      'includes': [
+        '../../ref/oec_ref.gypi',
+      ],
+    }],
+    ['oemcrypto_implementation_version=="opk"', {
+      # Include oemcrypto opk implementation code for building opk
+      # implementation fuzz binaries.
+      'dependencies': [
+        '<(oemcrypto_dir)/opk/ports/linux/wtpi_test_impl/wtpi_test_impl.gyp:oemcrypto_ta_test_impl_no_ipc',
+      ],
+    }],
   ],  # conditions
-  'libraries': [
-    '-lpthread',
-  ],
 }