Bug 1659392 - Only enable rust fuzzing code with libFuzzer. r=truber

Differential Revision: https://phabricator.services.mozilla.com/D87228

config/makefiles/rust.mk

@@ -83,7 +83,7 @@ rustflags_neon += -C target_feature=+neon,-d16
 endif
 
 rustflags_sancov =
-ifdef FUZZING_INTERFACES
+ifdef LIBFUZZER
 ifndef MOZ_TSAN
 # These options should match what is implicitly enabled for `clang -fsanitize=fuzzer`
 #   here: https://github.com/llvm/llvm-project/blob/release/8.x/clang/lib/Driver/SanitizerArgs.cpp#L354

toolkit/library/gtest/rust/Cargo.toml

@@ -26,7 +26,7 @@ gecko_profiler_parse_elf = ["gkrust-shared/gecko_profiler_parse_elf"]
 bitsdownload = ["gkrust-shared/bitsdownload"]
 new_xulstore = ["gkrust-shared/new_xulstore"]
 new_cert_storage = ["gkrust-shared/new_cert_storage"]
-fuzzing_interfaces = ["gkrust-shared/fuzzing_interfaces", "gecko-fuzz-targets"]
+libfuzzer = ["gkrust-shared/libfuzzer", "gecko-fuzz-targets"]
 webrtc = ["gkrust-shared/webrtc"]
 wasm_library_sandboxing = ["gkrust-shared/wasm_library_sandboxing"]
 webgpu = ["gkrust-shared/webgpu"]

toolkit/library/gtest/rust/lib.rs

@@ -3,7 +3,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 extern crate bench_collections_gtest;
-#[cfg(feature = "fuzzing_interfaces")]
+#[cfg(feature = "libfuzzer")]
 extern crate gecko_fuzz_targets;
 extern crate gkrust_shared;
 extern crate mp4parse_gtest;

toolkit/library/rust/Cargo.toml

@@ -27,7 +27,7 @@ gecko_profiler_parse_elf = ["gkrust-shared/gecko_profiler_parse_elf"]
 bitsdownload = ["gkrust-shared/bitsdownload"]
 new_xulstore = ["gkrust-shared/new_xulstore"]
 new_cert_storage = ["gkrust-shared/new_cert_storage"]
-fuzzing_interfaces = ["gkrust-shared/fuzzing_interfaces"]
+libfuzzer = ["gkrust-shared/libfuzzer"]
 webrtc = ["gkrust-shared/webrtc"]
 wasm_library_sandboxing = ["gkrust-shared/wasm_library_sandboxing"]
 webgpu = ["gkrust-shared/webgpu"]

toolkit/library/rust/gkrust-features.mozbuild

@@ -65,8 +65,8 @@ if CONFIG['MOZ_NEW_XULSTORE']:
 if CONFIG['MOZ_NEW_CERT_STORAGE']:
     gkrust_features += ['new_cert_storage']
 
-if CONFIG['FUZZING_INTERFACES']:
-    gkrust_features += ['fuzzing_interfaces']
+if CONFIG['LIBFUZZER']:
+    gkrust_features += ['libfuzzer']
 
 if CONFIG['MOZ_WEBRTC']:
     gkrust_features += ['webrtc']

toolkit/library/rust/shared/Cargo.toml

@@ -98,7 +98,7 @@ gecko_profiler = ["profiler_helper", "geckoservo/gecko_profiler"]
 gecko_profiler_parse_elf = ["profiler_helper/parse_elf"]
 new_xulstore = ["xulstore"]
 new_cert_storage = ["cert_storage"]
-fuzzing_interfaces = []
+libfuzzer = []
 webrtc = ["mdns_service"]
 wasm_library_sandboxing = ["rlbox_lucet_sandbox"]
 webgpu = ["wgpu_bindings"]

tools/fuzzing/moz.build

@@ -18,10 +18,10 @@ if not CONFIG['JS_STANDALONE']:
     'ipc',
   ]
 
-if not CONFIG['JS_STANDALONE'] and CONFIG['FUZZING_INTERFACES']:
-  DIRS += [
-    'rust',
-  ]
+  if CONFIG['LIBFUZZER']:
+    DIRS += [
+      'rust',
+    ]
 
 if CONFIG['LIBFUZZER']:
   DIRS += [