From 038ba6eea2b2acd79084d5a979126ac8c952bee4 Mon Sep 17 00:00:00 2001
From: Charly Delay <delay@google.com>
Date: Tue, 3 Jul 2018 15:01:12 -0400
Subject: [PATCH] compat.gyp: use type=none for header-only target

On Linux and macOS, compat.gyp:crashpad_compat is a header-only target,
which should be declared type=none.

This CL also adds the missing non_mac/ include_dirs for non-macOS
targets.

Bug: crashpad:
Change-Id: I7bef32e8f6bdcb86f51118a1bb1d3b52d05120d1
Reviewed-on: https://chromium-review.googlesource.com/1124773
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
---
 compat/compat.gyp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/compat/compat.gyp b/compat/compat.gyp
index 2c5eeff3..1229ee0c 100644
--- a/compat/compat.gyp
+++ b/compat/compat.gyp
@@ -19,7 +19,6 @@
   'targets': [
     {
       'target_name': 'crashpad_compat',
-      'type': 'static_library',
       'sources': [
         'android/dlfcn_internal.cc',
         'android/dlfcn_internal.h',
@@ -63,6 +62,7 @@
       ],
       'conditions': [
         ['OS=="mac"', {
+          'type': 'none',
           'include_dirs': [
             'mac',
           ],
@@ -71,8 +71,18 @@
               'mac',
             ],
           },
+        }, {
+          'include_dirs': [
+            'non_mac',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              'non_mac',
+            ],
+          },
         }],
         ['OS=="win"', {
+          'type': 'static_library',
           'include_dirs': [
             'win',
           ],
@@ -95,6 +105,7 @@
           },
         }],
         ['OS=="android"', {
+          'type': 'static_library',
           'include_dirs': [
             'android',
             'linux',
@@ -112,6 +123,7 @@
           },
         }],
         ['OS=="linux"', {
+          'type': 'none',
           'include_dirs': [
             'linux',
           ],