[build] Remove remaining disable-inspector options in GN

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

BUILD.gn

@@ -194,10 +194,10 @@ config("external_config") {
   if (is_component_build) {
     defines = [ "USING_V8_SHARED" ]
   }
-  include_dirs = [ "include" ]
-  if (v8_enable_inspector) {
-    include_dirs += [ "$target_gen_dir/include" ]
-  }
+  include_dirs = [
+    "include",
+    "$target_gen_dir/include",
+  ]
 }
 
 # This config should only be applied to code that needs to be explicitly
@@ -788,7 +788,6 @@ action("v8_dump_build_config") {
     "target_cpu=\"$target_cpu\"",
     "v8_current_cpu=\"$v8_current_cpu\"",
     "v8_enable_i18n_support=$v8_enable_i18n_support",
-    "v8_enable_inspector=$v8_enable_inspector",
     "v8_target_cpu=\"$v8_target_cpu\"",
     "v8_use_snapshot=$v8_use_snapshot",
   ]
@@ -1043,6 +1042,8 @@ v8_source_set("v8_base") {
 
     ### gcmole(all) ###
     "include/v8-debug.h",
+    "include/v8-inspector-protocol.h",
+    "include/v8-inspector.h",
     "include/v8-platform.h",
     "include/v8-profiler.h",
     "include/v8-testing.h",
@@ -2374,6 +2375,7 @@ v8_source_set("v8_base") {
     ":v8_libbase",
     ":v8_libsampler",
     ":v8_version",
+    "src/inspector:inspector",
   ]
 
   sources += [ v8_generated_peephole_source ]
@@ -2395,14 +2397,6 @@ v8_source_set("v8_base") {
     sources += [ "$target_gen_dir/debug-support.cc" ]
     deps += [ ":postmortem-metadata" ]
   }
-
-  if (v8_enable_inspector) {
-    sources += [
-      "include/v8-inspector-protocol.h",
-      "include/v8-inspector.h",
-    ]
-    deps += [ "src/inspector:inspector" ]
-  }
 }
 
 v8_component("v8_libbase") {
@@ -2806,9 +2800,6 @@ v8_executable("d8") {
   }
 
   defines = []
-  if (v8_enable_inspector) {
-    defines += [ "V8_INSPECTOR_ENABLED" ]
-  }
 
   if (v8_enable_vtunejit) {
     deps += [ "//src/third_party/vtune:v8_vtune" ]

gni/isolate.gni

@@ -101,11 +101,6 @@ template("v8_isolate_run") {
       } else {
         icu_use_data_file_flag = "0"
       }
-      if (v8_enable_inspector) {
-        enable_inspector = "1"
-      } else {
-        enable_inspector = "0"
-      }
       if (v8_use_external_startup_data) {
         use_external_startup_data = "1"
       } else {
@@ -177,8 +172,6 @@ template("v8_isolate_run") {
         "--config-variable",
         "target_arch=$target_arch",
         "--config-variable",
-        "v8_enable_inspector=$enable_inspector",
-        "--config-variable",
         "v8_use_external_startup_data=$use_external_startup_data",
         "--config-variable",
         "v8_use_snapshot=$use_snapshot",

gni/v8.gni

@@ -37,9 +37,6 @@ declare_args() {
   # add a dependency on the ICU library.
   v8_enable_i18n_support = true
 
-  # Enable inspector. See include/v8-inspector.h.
-  v8_enable_inspector = true
-
   # Use static libraries instead of source_sets.
   v8_static_library = false
 }

gypfiles/isolate.gypi

@@ -82,7 +82,6 @@
         '--config-variable', 'sanitizer_coverage=<(sanitizer_coverage)',
         '--config-variable', 'component=<(component)',
         '--config-variable', 'target_arch=<(target_arch)',
-        '--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)',
       ],

src/d8.cc

@@ -22,6 +22,7 @@
 
 #include "include/libplatform/libplatform.h"
 #include "include/libplatform/v8-tracing.h"
+#include "include/v8-inspector.h"
 #include "src/api.h"
 #include "src/base/cpu.h"
 #include "src/base/logging.h"
@@ -39,10 +40,6 @@
 #include "src/utils.h"
 #include "src/v8.h"
 
-#ifdef V8_INSPECTOR_ENABLED
-#include "include/v8-inspector.h"
-#endif  // V8_INSPECTOR_ENABLED
-
 #if !defined(_WIN32) && !defined(_WIN64)
 #include <unistd.h>  // NOLINT
 #else
@@ -1937,7 +1934,6 @@ void Shell::RunShell(Isolate* isolate) {
   printf("\n");
 }
 
-#ifdef V8_INSPECTOR_ENABLED
 class InspectorFrontend final : public v8_inspector::V8Inspector::Channel {
  public:
   explicit InspectorFrontend(Local<Context> context) {
@@ -2070,12 +2066,6 @@ class InspectorClient : public v8_inspector::V8InspectorClient {
   Global<Context> context_;
   Isolate* isolate_;
 };
-#else   // V8_INSPECTOR_ENABLED
-class InspectorClient {
- public:
-  InspectorClient(Local<Context> context, bool connect) { CHECK(!connect); }
-};
-#endif  // V8_INSPECTOR_ENABLED
 
 SourceGroup::~SourceGroup() {
   delete thread_;

src/d8.gyp

@@ -42,9 +42,6 @@
         'v8.gyp:v8_libbase',
         'v8.gyp:v8_libplatform',
       ],
-      'defines': [
-        'V8_INSPECTOR_ENABLED',
-      ],
       # Generated source files need this explicitly:
       'include_dirs+': [
         '..',

test/BUILD.gn

@@ -10,6 +10,7 @@ group("gn_all") {
 
   deps = [
     ":default_tests",
+    "inspector:inspector-test",
   ]
 
   if (host_os != "mac" || !is_android) {
@@ -21,10 +22,6 @@ group("gn_all") {
     ]
   }
 
-  if (v8_enable_inspector) {
-    deps += [ "inspector:inspector-test" ]
-  }
-
   if (v8_test_isolation_mode != "noop") {
     deps += [
       ":benchmarks_run",
@@ -136,10 +133,9 @@ v8_isolate_run("fuzzer") {
 }
 
 v8_isolate_run("inspector-test") {
-  deps = []
-  if (v8_enable_inspector) {
-    deps += [ "inspector:inspector-test" ]
-  }
+  deps = [
+    "inspector:inspector-test",
+  ]
 
   isolate = "inspector/inspector.isolate"
 }

test/debugger/debugger.isolate

@@ -3,15 +3,11 @@
 # found in the LICENSE file.
 
 {
-  'conditions': [
-    ['v8_enable_inspector==1', {
-      'variables': {
-        'files': [
-          './',
-        ],
-      },
-    }],
-  ],
+  'variables': {
+    'files': [
+      './',
+    ],
+  },
   'includes': [
     '../../src/d8.isolate',
     '../../tools/testrunner/testrunner.isolate',

test/inspector/BUILD.gn

@@ -4,32 +4,30 @@
 
 import("../../gni/v8.gni")
 
-if (v8_enable_inspector) {
-  v8_executable("inspector-test") {
-    testonly = true
+v8_executable("inspector-test") {
+  testonly = true
 
-    sources = [
-      "inspector-impl.cc",
-      "inspector-impl.h",
-      "inspector-test.cc",
-      "task-runner.cc",
-      "task-runner.h",
-    ]
+  sources = [
+    "inspector-impl.cc",
+    "inspector-impl.h",
+    "inspector-test.cc",
+    "task-runner.cc",
+    "task-runner.h",
+  ]
 
-    configs = [
-      "../..:external_config",
-      "../..:internal_config_base",
-    ]
+  configs = [
+    "../..:external_config",
+    "../..:internal_config_base",
+  ]
 
-    deps = [
-      "../..:v8",
-      "../..:v8_libbase",
-      "../..:v8_libplatform",
-      "//build/config/sanitizers:deps",
-      "//build/win:default_exe_manifest",
-    ]
+  deps = [
+    "../..:v8",
+    "../..:v8_libbase",
+    "../..:v8_libplatform",
+    "//build/config/sanitizers:deps",
+    "//build/win:default_exe_manifest",
+  ]
 
-    cflags = []
-    ldflags = []
-  }
+  cflags = []
+  ldflags = []
 }

test/inspector/inspector.isolate

@@ -2,27 +2,23 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'conditions': [
-    ['v8_enable_inspector==1', {
-      'variables': {
-        'files': [
-          './console/',
-          './cpu-profiler/',
-          './debugger/',
-          './inspector.status',
-          './json-parse-expected.txt',
-          './json-parse.js',
-          './protocol-test.js',
-          './runtime/',
-          './testcfg.py',
-          '../../src/inspector/injected-script-source.js',
-          '<(PRODUCT_DIR)/inspector-test<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
+  'variables': {
+    'files': [
+      './console/',
+      './cpu-profiler/',
+      './debugger/',
+      './inspector.status',
+      './json-parse-expected.txt',
+      './json-parse.js',
+      './protocol-test.js',
+      './runtime/',
+      './testcfg.py',
+      '../../src/inspector/injected-script-source.js',
+      '<(PRODUCT_DIR)/inspector-test<(EXECUTABLE_SUFFIX)',
+    ],
+  },
   'includes': [
     '../../src/base.isolate',
     '../../tools/testrunner/testrunner.isolate',
   ],
-}
+}
\ No newline at end of file

tools/run-tests.py

@@ -263,9 +263,6 @@ def BuildOptions():
   result.add_option("--download-data-only",
                     help="Deprecated",
                     default=False, action="store_true")
-  result.add_option("--enable-inspector",
-                    help="Indicates a build with inspector support",
-                    default=True, action="store_true")
   result.add_option("--extra-flags",
                     help="Additional flags to pass to each test command",
                     default="")
@@ -496,7 +493,6 @@ def ProcessOptions(options):
       options.arch = 'ia32'
     options.asan = build_config["is_asan"]
     options.dcheck_always_on = build_config["dcheck_always_on"]
-    options.enable_inspector = build_config["v8_enable_inspector"]
     options.mode = 'debug' if build_config["is_debug"] else 'release'
     options.msan = build_config["is_msan"]
     options.no_i18n = not build_config["v8_enable_i18n_support"]
@@ -623,13 +619,6 @@ def ProcessOptions(options):
   if options.no_i18n:
     TEST_MAP["bot_default"].remove("intl")
     TEST_MAP["default"].remove("intl")
-  if not options.enable_inspector:
-    TEST_MAP["default"].remove("inspector")
-    TEST_MAP["bot_default"].remove("inspector")
-    TEST_MAP["optimize_for_size"].remove("inspector")
-    TEST_MAP["default"].remove("debugger")
-    TEST_MAP["bot_default"].remove("debugger")
-    TEST_MAP["optimize_for_size"].remove("debugger")
   return True