| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index 37929b582ffe577a773f0a38a77ff6c76389adae..5adf44e83e14c547b291563a5b4f12c799239c0c 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -71,6 +71,11 @@
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| ],
|
| + }, { # 'OS!="ios"
|
| + 'dependencies': [
|
| + '../device/bluetooth/bluetooth.gyp:*',
|
| + '../device/device_tests.gyp:*',
|
| + ],
|
| }],
|
| ['OS=="android"', {
|
| 'dependencies': [
|
| @@ -134,7 +139,6 @@
|
| '../ppapi/ppapi.gyp:*',
|
| '../ppapi/ppapi_internal.gyp:*',
|
| '../ppapi/tools/ppapi_tools.gyp:*',
|
| - '../printing/printing.gyp:*',
|
| '../skia/skia.gyp:*',
|
| '../sync/tools/sync_tools.gyp:*',
|
| '../third_party/WebKit/public/all.gyp:*',
|
| @@ -160,12 +164,6 @@
|
| '<(libjpeg_gyp_path):*',
|
| ],
|
| }],
|
| - ['OS!="ios"', {
|
| - 'dependencies': [
|
| - '../device/bluetooth/bluetooth.gyp:*',
|
| - '../device/device_tests.gyp:*',
|
| - ],
|
| - }],
|
| ['use_openssl==0 and OS=="ios"', {
|
| 'dependencies': [
|
| '../third_party/nss/nss.gyp:*',
|
| @@ -294,6 +292,11 @@
|
| '../third_party/openh264/openh264.gyp:*',
|
| ],
|
| }],
|
| + ['enable_basic_printing==1 or enable_print_preview==1', {
|
| + 'dependencies': [
|
| + '../printing/printing.gyp:*',
|
| + ],
|
| + }],
|
| ],
|
| }, # target_name: All
|
| {
|
|
|