Remove CONFIG_OPTIONS_FILE macro This commit removes the macro by assuming the value is true. Change-Id: I73be0f0feeadb853e565e5ad24dd46f7fb0a105c

diff --git a/aom/src/aom_encoder.c b/aom/src/aom_encoder.c
index c65d678..6a4791a 100644
--- a/aom/src/aom_encoder.c
+++ b/aom/src/aom_encoder.c

@@ -168,8 +168,6 @@
       }
     }
   }
-
-#if CONFIG_OPTIONS_FILE
   /* default values */
   if (cfg) {
     memset(&cfg->encoder_cfg, 0, sizeof(cfg->encoder_cfg));
@@ -178,8 +176,6 @@
     cfg->encoder_cfg.min_partition_size = 4;
     cfg->encoder_cfg.disable_trellis_quant = 3;
   }
-#endif
-
   return res;
 }
 

diff --git a/apps/aomenc.c b/apps/aomenc.c
index 9b06b28..1963964 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c

@@ -158,9 +158,7 @@
     ARG_DEF("v", "verbose", 0, "Show encoder parameters");
 static const arg_def_t psnrarg =
     ARG_DEF(NULL, "psnr", 0, "Show PSNR in status line");
-#if CONFIG_OPTIONS_FILE
 static const arg_def_t use_cfg = ARG_DEF("c", "cfg", 1, "Config file to use");
-#endif
 
 static const struct arg_enum_list test_decode_enum[] = {
   { "off", TEST_DECODE_OFF },
@@ -203,9 +201,7 @@
     NULL, "input-chroma-subsampling-y", 1, "chroma subsampling y value.");
 
 static const arg_def_t *main_args[] = { &help,
-#if CONFIG_OPTIONS_FILE
                                         &use_cfg,
-#endif
                                         &debugmode,
                                         &outputfile,
                                         &codecarg,
@@ -1118,7 +1114,6 @@
   if (!rat->den) die("Error: %s has zero denominator\n", msg);
 }
 
-#if CONFIG_OPTIONS_FILE
 static void init_config(cfg_options_t *config) {
   memset(config, 0, sizeof(cfg_options_t));
   config->super_block_size = 0;  // Dynamic
@@ -1126,7 +1121,6 @@
   config->min_partition_size = 4;
   config->disable_trellis_quant = 3;
 }
-#endif
 
 /* Parses global config arguments into the AvxEncoderConfig. Note that
  * argv is modified and overwrites all parsed arguments.
@@ -1145,22 +1139,18 @@
   global->color_type = I420;
   global->csp = AOM_CSP_UNKNOWN;
 
-#if CONFIG_OPTIONS_FILE
   int cfg_included = 0;
   init_config(&global->encoder_config);
-#endif
 
   for (argi = argj = argv_local; (*argj = *argi); argi += arg.argv_step) {
     arg.argv_step = 1;
 
-#if CONFIG_OPTIONS_FILE
     if (arg_match(&arg, &use_cfg, argi)) {
       if (cfg_included) continue;
       parse_cfg(arg.val, &global->encoder_config);
       cfg_included = 1;
       continue;
     }
-#endif
     if (arg_match(&arg, &help, argi)) {
       show_help(stdout, 0);
       exit(EXIT_SUCCESS);
@@ -1352,11 +1342,8 @@
 
     /* Allows removal of the application version from the EBML tags */
     stream->webm_ctx.debug = global->debug;
-
-#if CONFIG_OPTIONS_FILE
     memcpy(&stream->config.cfg.encoder_cfg, &global->encoder_config,
            sizeof(stream->config.cfg.encoder_cfg));
-#endif
   }
 
   /* Output files must be specified for each stream */
@@ -1745,7 +1732,6 @@
   SHOW(kf_min_dist);
   SHOW(kf_max_dist);
 
-#if CONFIG_OPTIONS_FILE
 #define SHOW_PARAMS(field)                    \
   fprintf(stderr, "    %-28s = %d\n", #field, \
           stream->config.cfg.encoder_cfg.field)
@@ -1784,7 +1770,6 @@
   SHOW_PARAMS(disable_ref_frame_mv);
   SHOW_PARAMS(reduced_reference_set);
   SHOW_PARAMS(reduced_tx_type_set);
-#endif
 }
 
 static void open_output_file(struct stream_state *stream,
@@ -2238,11 +2223,7 @@
   argv = argv_dup(argc - 1, argv_ + 1);
   parse_global_config(&global, &argv);
 
-#if CONFIG_OPTIONS_FILE
   if (argc < 2) usage_exit();
-#else
-  if (argc < 3) usage_exit();
-#endif
 
   switch (global.color_type) {
     case I420: input.fmt = AOM_IMG_FMT_I420; break;

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 21b82d6..427e017 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c

@@ -586,7 +586,6 @@
   oxcf->superres_kf_qthresh = 255;
 }
 
-#if CONFIG_OPTIONS_FILE
 static void update_default_encoder_config(const cfg_options_t *cfg,
                                           struct av1_extracfg *extra_cfg) {
   extra_cfg->enable_cdef = (cfg->disable_cdef == 0);
@@ -630,16 +629,13 @@
   extra_cfg->enable_reduced_reference_set = cfg->reduced_reference_set;
   extra_cfg->reduced_tx_type_set = cfg->reduced_tx_type_set;
 }
-#endif
 
 static aom_codec_err_t set_encoder_config(AV1EncoderConfig *oxcf,
                                           const aom_codec_enc_cfg_t *cfg,
                                           struct av1_extracfg *extra_cfg) {
-#if CONFIG_OPTIONS_FILE
   if (cfg->encoder_cfg.init_by_cfg_file) {
     update_default_encoder_config(&cfg->encoder_cfg, extra_cfg);
   }
-#endif
 
   const int is_vbr = cfg->rc_end_usage == AOM_VBR;
   oxcf->profile = cfg->g_profile;
@@ -688,9 +684,7 @@
     oxcf->init_framerate = 30;
     oxcf->timing_info_present = 0;
   }
-#if CONFIG_OPTIONS_FILE
   oxcf->encoder_cfg = &cfg->encoder_cfg;
-#endif
 
   switch (cfg->g_pass) {
     case AOM_RC_ONE_PASS: oxcf->pass = 0; break;

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 7fb49f9..2e6cdf7 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h

@@ -428,9 +428,7 @@
   unsigned int tier_mask;
   // min_cr / 100 is the target minimum compression ratio for each frame.
   unsigned int min_cr;
-#if CONFIG_OPTIONS_FILE
   const cfg_options_t *encoder_cfg;
-#endif
 } AV1EncoderConfig;
 
 static INLINE int is_lossless_requested(const AV1EncoderConfig *cfg) {

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 7328a24..5a043ec 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake

@@ -96,7 +96,6 @@
                    "Coefficient range check.")
 set_aom_config_var(CONFIG_DENOISE 1
                    "Denoise/noise modeling support in encoder.")
-set_aom_config_var(CONFIG_OPTIONS_FILE 1 "Enables encoder config file support.")
 set_aom_config_var(CONFIG_INSPECTION 0 "Enables bitstream inspection.")
 set_aom_config_var(CONFIG_INTERNAL_STATS 0 "Enables internal encoder stats.")
 set_aom_config_var(FORCE_HIGHBITDEPTH_DECODING 0