Commit 70009066 authored by glider's avatar glider Committed by Commit bot

Fix printing.gyp by joining two 'conditions' dicts together.

Revision b779ce61 broke the
generate_build_files step on the Dr. Memory build:

gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\drm-cr\build\src\printing\printing.gyp

BUG=607668
TEST=none
TBR=skau@chromium.org

Review-Url: https://codereview.chromium.org/2173063002
Cr-Commit-Position: refs/heads/master@{#407160}
parent cdf365d0
...@@ -167,14 +167,6 @@ ...@@ -167,14 +167,6 @@
], ],
}, },
}], }],
],
'defines': [
# PRINT_BACKEND_AVAILABLE disables the default dummy implementation
# of the print backend and enables a custom implementation instead.
'PRINT_BACKEND_AVAILABLE',
],
'conditions': [
['chromeos==1', { ['chromeos==1', {
'sources': [ 'sources': [
'backend/cups_connection.cc', 'backend/cups_connection.cc',
...@@ -196,6 +188,11 @@ ...@@ -196,6 +188,11 @@
], ],
}], }],
], ],
'defines': [
# PRINT_BACKEND_AVAILABLE disables the default dummy implementation
# of the print backend and enables a custom implementation instead.
'PRINT_BACKEND_AVAILABLE',
],
}], }],
['OS=="linux" and chromeos==1', { ['OS=="linux" and chromeos==1', {
'defines': [ 'defines': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment