summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-10 16:56:07 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-10 16:56:07 +0000
commit5c5b8bf111701f23caeb867b76fb16d9b4684c30 (patch)
treeb6f19219b98053619930f3d304768d6c33dd49bf /printing
parentf04dc7be24de4f01e2f9d16a2296de56dba02de5 (diff)
downloadchromium_src-5c5b8bf111701f23caeb867b76fb16d9b4684c30.zip
chromium_src-5c5b8bf111701f23caeb867b76fb16d9b4684c30.tar.gz
chromium_src-5c5b8bf111701f23caeb867b76fb16d9b4684c30.tar.bz2
Revert 282355 "Add chrome/browser/ui to the GN build."
> Add chrome/browser/ui to the GN build. > > This moves the intermediate grit files: > ui/ui_resources -> ui/resources > ui/ui_strings -> ui/strings > in the GYP build to put it in line with the GN one (and also what one would expect). > > R=ajwong@chromium.org > > Review URL: https://codereview.chromium.org/381463002 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/387573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/BUILD.gn3
1 files changed, 2 insertions, 1 deletions
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index 04b2b9a..b6f3763 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/features.gni")
import("//build/config/ui.gni")
if (is_mac) {
import("//build/config/mac/mac_sdk.gni")
@@ -11,6 +10,8 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
+use_cups = ((is_linux && !is_chromeos) || is_mac)
+
component("printing") {
sources = [
"backend/print_backend.cc",