Remove special output_dir from cloud_print's BUILD files.

BUG=697092 Review-Url: https://codereview.chromium.org/2741633003 Cr-Commit-Position: refs/heads/master@{#456061}
marcosholgado · Mar 10, 2017 · 900f63e · 900f63e
1 parent 831adc8
commit 900f63e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/cloud_print/DEPS b/cloud_print/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
   "+chrome/common",
   "+chrome/installer/launcher_support",
-  "+virtual_driver_setup_resources",
 ]
diff --git a/cloud_print/virtual_driver/win/install/BUILD.gn b/cloud_print/virtual_driver/win/install/BUILD.gn
@@ -62,7 +62,7 @@ grit("resources") {
 
   # TODO(thakis): Consider removing this in favor of the default directory,
   # https://crbug.com/697092
-  output_dir = "$root_gen_dir/virtual_driver_setup_resources"
+  # output_dir = "$root_gen_dir/virtual_driver_setup_resources"
 
   outputs = [
     "grit/virtual_driver_setup_resources.h",

diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
@@ -21,9 +21,9 @@
 #include "base/win/windows_version.h"
 #include "cloud_print/common/win/cloud_print_utils.h"
 #include "cloud_print/common/win/install_utils.h"
+#include "cloud_print/virtual_driver/win/install/grit/virtual_driver_setup_resources.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_consts.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
-#include "virtual_driver_setup_resources/grit/virtual_driver_setup_resources.h"
 
 #include <strsafe.h>  // Must be after base headers to avoid deprecation
                       // warnings.