[libfuzzer] store custom options in .GN build target instead of a separate file.

testing/libfuzzer/fuzzer_test.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines fuzzer_test.
 #
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//testing/test.gni")
 
@@ skipping 18 matching lines @@
 template("fuzzer_test") {
   if (!disable_libfuzzer && (use_libfuzzer || use_drfuzz || is_linux)) {
     assert(defined(invoker.sources), "Need sources in $target_name.")
 
     test_deps = [ "//testing/libfuzzer:libfuzzer_main" ]
 
     if (defined(invoker.deps)) {
       test_deps += invoker.deps
     }
 
-    if (defined(invoker.libfuzzer_options) && !defined(invoker.dict)) {
-      # Copy libfuzzer_options to output if dict is not provided.
-      copy(target_name + "_libfuzzer_options_copy") {
-        sources = [
-          invoker.libfuzzer_options,
-        ]
-        outputs = [
-          "$root_build_dir/" + target_name + ".options",
-        ]
-      }
-
-      test_deps += [ ":" + target_name + "_libfuzzer_options_copy" ]
-    }
-
     if (defined(invoker.seed_corpus)) {
       depfile = "$root_build_dir/$target_name" + ".seed_corpus.d"
       out = "$root_build_dir/$target_name" + "_seed_corpus.zip"
 
       action(target_name + "_seed_corpus") {
         script = "//testing/libfuzzer/archive_corpus.py"
         args = [
           "--depfile",
           rebase_path(depfile),
           "--corpus",
           rebase_path(invoker.seed_corpus),
           "--output",
           rebase_path(out),
           "--fuzzer",
           rebase_path("$root_build_dir/$target_name"),
         ]
 
         depfile = depfile
         outputs = [
           out,
         ]
         deps = [
           "//testing/libfuzzer:seed_corpus",
         ]
       }
 
       test_deps += [ ":" + target_name + "_seed_corpus" ]
     }
 
-    if (defined(invoker.dict)) {
-      # Copy dictionary to output.
-      copy(target_name + "_dict_copy") {
-        sources = [
-          invoker.dict,
-        ]
-        outputs = [
-          "$root_build_dir/" + target_name + ".dict",
-        ]
+    if (defined(invoker.dict) || defined(invoker.libfuzzer_options)) {
+      if (defined(invoker.dict)) {
+        # Copy dictionary to output.
+        copy(target_name + "_dict_copy") {
+          sources = [
+            invoker.dict,
+          ]
+          outputs = [
+            "$root_build_dir/" + target_name + ".dict",
+          ]
+        }
+        test_deps += [ ":" + target_name + "_dict_copy" ]
       }
 
-      test_deps += [ ":" + target_name + "_dict_copy" ]
-
-      # Generate new .options file or update an existing one.
+      # Generate .options file.
       config_name = target_name + ".options"
       action(config_name) {
         script = "//testing/libfuzzer/gen_fuzzer_config.py"
         args = [
           "--config",
           rebase_path("$root_build_dir/" + config_name),
-          "--dict",
-          rebase_path("$root_build_dir/" + invoker.target_name + ".dict"),
         ]
 
-        if (defined(invoker.libfuzzer_options)) {
+        if (defined(invoker.dict)) {
           args += [
-            "--libfuzzer_options",
-            rebase_path(invoker.libfuzzer_options),
+            "--dict",
+            rebase_path("$root_build_dir/" + invoker.target_name + ".dict"),
           ]
         }
+
+        if (defined(invoker.libfuzzer_options)) {
+          args += [ "--libfuzzer_options" ]
+          args += invoker.libfuzzer_options
+        }
+
         outputs = [
           "$root_build_dir/$config_name",
         ]
       }
       test_deps += [ ":" + config_name ]
     }
 
     test(target_name) {
       forward_variables_from(invoker,
                              [
@@ skipping 24 matching lines @@
       assert(invoker.libfuzzer_options == [] || invoker.libfuzzer_options != [])
     }
     if (defined(invoker.seed_corpus)) {
       assert(invoker.seed_corpus == [] || invoker.seed_corpus != [])
     }
 
     group(target_name) {
     }
   }
 }