[build] Make inspector the default in gyp

Bug: chromium:645890
Change-Id: If34ac1336d0ee3c23e89050aef2cf30b754b67c1
Reviewed-on: https://chromium-review.googlesource.com/461145
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44272}

gypfiles/all.gyp

@@ -9,6 +9,7 @@
       'type': 'none',
       'dependencies': [
         '../src/d8.gyp:d8',
+        '../test/inspector/inspector.gyp:*',
       ],
       'conditions': [
         ['component!="shared_library"', {
@@ -25,20 +26,11 @@
             '../test/unittests/unittests.gyp:*',
           ],
         }],
-        ['v8_enable_inspector==1', {
-          'dependencies': [
-            '../test/inspector/inspector.gyp:*',
-          ],
-        }],
-        ['v8_enable_inspector==1 and test_isolation_mode != "noop"', {
-          'dependencies': [
-            '../test/debugger/debugger.gyp:*',
-          ],
-        }],
         ['test_isolation_mode != "noop"', {
           'dependencies': [
             '../test/bot_default.gyp:*',
             '../test/benchmarks/benchmarks.gyp:*',
+            '../test/debugger/debugger.gyp:*',
             '../test/default.gyp:*',
             '../test/intl/intl.gyp:*',
             '../test/message/message.gyp:*',

gypfiles/isolate.gypi

@@ -82,7 +82,7 @@
         '--config-variable', 'sanitizer_coverage=<(sanitizer_coverage)',
         '--config-variable', 'component=<(component)',
         '--config-variable', 'target_arch=<(target_arch)',
-        '--config-variable', 'v8_enable_inspector=<(v8_enable_inspector)',
+        '--config-variable', 'v8_enable_inspector=1',
         '--config-variable', 'v8_use_external_startup_data=<(v8_use_external_startup_data)',
         '--config-variable', 'v8_use_snapshot=<(v8_use_snapshot)',
       ],

gypfiles/standalone.gypi

@@ -46,7 +46,6 @@
     'msvs_multi_core_compile%': '1',
     'mac_deployment_target%': '10.7',
     'release_extra_cflags%': '',
-    'v8_enable_inspector%': 1,
     'variables': {
       'variables': {
         'variables': {
@@ -243,9 +242,6 @@
     # Relative path to icu.gyp from this file.
     'icu_gyp_path': '../third_party/icu/icu.gyp',
 
-    # Relative path to inspector.gyp from this file.
-    'inspector_gyp_path': '../src/v8-inspector/inspector.gyp',
-
     'conditions': [
       ['(v8_target_arch=="arm" and host_arch!="arm") or \
         (v8_target_arch=="arm64" and host_arch!="arm64") or \

src/d8.gyp

@@ -42,6 +42,9 @@
         'v8.gyp:v8_libbase',
         'v8.gyp:v8_libplatform',
       ],
+      'defines': [
+        'V8_INSPECTOR_ENABLED',
+      ],
       # Generated source files need this explicitly:
       'include_dirs+': [
         '..',
@@ -53,11 +56,6 @@
         '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
       ],
       'conditions': [
-        ['v8_enable_inspector == 1', {
-          'defines': [
-            'V8_INSPECTOR_ENABLED',
-          ],
-        }],
         [ 'want_separate_host_toolset==1', {
           'toolsets': [ 'target', ],
           'dependencies': [

src/v8.gyp

@@ -34,7 +34,6 @@
     'warmup_script%': "",
     'v8_extra_library_files%': [],
     'v8_experimental_extra_library_files%': [],
-    'v8_enable_inspector%': 1,
     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
     'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)',
     'v8_os_page_size%': 0,
@@ -371,6 +370,9 @@
       'dependencies': [
         'v8_libbase',
         'v8_libsampler',
+        'inspector/inspector.gyp:protocol_generated_sources',
+        'inspector/inspector.gyp:inspector_injected_script',
+        'inspector/inspector.gyp:inspector_debugger_script',
       ],
       'objs': ['foo.o'],
       'variables': {
@@ -389,6 +391,7 @@
         'process_outputs_as_sources': 1,
       }],
       'sources': [  ### gcmole(all) ###
+        '<@(inspector_all_sources)',
         '../include/v8-debug.h',
         '../include/v8-platform.h',
         '../include/v8-profiler.h',
@@ -1829,16 +1832,6 @@
             'i18n.h',
           ],
         }],
-        ['v8_enable_inspector==1', {
-          'sources': [
-            '<@(inspector_all_sources)'
-          ],
-          'dependencies': [
-            'inspector/inspector.gyp:protocol_generated_sources',
-            'inspector/inspector.gyp:inspector_injected_script',
-            'inspector/inspector.gyp:inspector_debugger_script',
-          ],
-        }],
         ['OS=="win" and v8_enable_i18n_support==1', {
           'dependencies': [
             '<(icu_gyp_path):icudata',

test/bot_default.gyp

@@ -12,6 +12,7 @@
           'dependencies': [
             'cctest/cctest.gyp:cctest_run',
             'fuzzer/fuzzer.gyp:fuzzer_run',
+            'inspector/inspector.gyp:inspector-test_run',
             'intl/intl.gyp:intl_run',
             'message/message.gyp:message_run',
             'mjsunit/mjsunit.gyp:mjsunit_run',
@@ -19,13 +20,6 @@
             'unittests/unittests.gyp:unittests_run',
             'webkit/webkit.gyp:webkit_run',
           ],
-          'conditions': [
-            ['v8_enable_inspector==1', {
-              'dependencies': [
-                'inspector/inspector.gyp:inspector-test_run',
-              ],
-            }],
-          ],
           'includes': [
             '../gypfiles/features.gypi',
             '../gypfiles/isolate.gypi',

test/default.gyp

@@ -12,19 +12,13 @@
           'dependencies': [
             'cctest/cctest.gyp:cctest_run',
             'fuzzer/fuzzer.gyp:fuzzer_run',
+            'inspector/inspector.gyp:inspector-test_run',
             'intl/intl.gyp:intl_run',
             'message/message.gyp:message_run',
             'mjsunit/mjsunit.gyp:mjsunit_run',
             'preparser/preparser.gyp:preparser_run',
             'unittests/unittests.gyp:unittests_run',
           ],
-          'conditions': [
-            ['v8_enable_inspector==1', {
-              'dependencies': [
-                'inspector/inspector.gyp:inspector-test_run',
-              ],
-            }],
-          ],
           'includes': [
             '../gypfiles/features.gypi',
             '../gypfiles/isolate.gypi',