Don't even include v8.h from libbase or libplatform

BUG=none
R=yangguo@chromium.org
LOG=n

Review URL: https://codereview.chromium.org/369073002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22182 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/BUILD.gn b/BUILD.gn
index 02919ed..5066ce1 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,6 +37,12 @@ config("internal_config") {
   }
 }
 
+config("internal_config_base") {
+  visibility = ":*"  # Only targets in this file can depend on this.
+
+  include_dirs = [ "." ]
+}
+
 # This config should only be applied to code using V8 and not any V8 code
 # itself.
 config("external_config") {
@@ -1014,7 +1020,7 @@ source_set("v8_libbase") {
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [ ":internal_config", ":features", ":toolchain" ]
+  configs += [ ":internal_config_base", ":features", ":toolchain" ]
 
   defines = []
 
@@ -1077,7 +1083,7 @@ source_set("v8_libplatform") {
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
-  configs += [ ":internal_config", ":features", ":toolchain" ]
+  configs += [ ":internal_config_base", ":features", ":toolchain" ]
 
   deps = [
     ":v8_libbase",

diff --git a/include/v8-platform.h b/include/v8-platform.h
index d8ef044..1f1679f 100644 (file)
--- a/include/v8-platform.h
+++ b/include/v8-platform.h
@@ -5,10 +5,10 @@
 #ifndef V8_V8_PLATFORM_H_
 #define V8_V8_PLATFORM_H_
 
-#include "v8.h"
-
 namespace v8 {
 
+class Isolate;
+
 /**
  * A Task represents a unit of work.
  */

diff --git a/src/base/DEPS b/src/base/DEPS
index 6548030..e53cadf 100644 (file)
--- a/src/base/DEPS
+++ b/src/base/DEPS
@@ -1,4 +1,7 @@
 include_rules = [
+  "-include",
+  "+include/v8config.h",
+  "+include/v8stdint.h",
   "-src",
   "+src/base",
 ]

diff --git a/src/base/atomicops.h b/src/base/atomicops.h
index b26fc4c..8c5cf3f 100644 (file)
--- a/src/base/atomicops.h
+++ b/src/base/atomicops.h
@@ -25,7 +25,7 @@
 #ifndef V8_BASE_ATOMICOPS_H_
 #define V8_BASE_ATOMICOPS_H_
 
-#include "include/v8.h"
+#include "include/v8stdint.h"
 #include "src/base/build_config.h"
 
 #if defined(_WIN32) && defined(V8_HOST_ARCH_64_BIT)

diff --git a/src/libplatform/DEPS b/src/libplatform/DEPS
index bba4fa0..2ea3359 100644 (file)
--- a/src/libplatform/DEPS
+++ b/src/libplatform/DEPS
@@ -1,4 +1,7 @@
 include_rules = [
+  "-include",
+  "+include/libplatform",
+  "+include/v8-platform.h",
   "-src",
   "+src/base",
   "+src/libplatform",

diff --git a/src/utils.h b/src/utils.h
index 35891f4..7f1011e 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "include/v8.h"
 #include "src/allocation.h"
 #include "src/base/logging.h"
 #include "src/base/macros.h"

diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 3fabc25..6f2f7a2 100644 (file)
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -996,12 +996,6 @@
         }, {
           'toolsets': ['target'],
         }],
-        ['component=="shared_library"', {
-          'defines': [
-            'BUILDING_V8_SHARED',
-            'V8_SHARED',
-          ],
-        }],
         ['OS=="linux"', {
             'link_settings': {
               'libraries': [
@@ -1193,12 +1187,6 @@
             }],
           ],
         }],
-        ['component=="shared_library"', {
-          'defines': [
-            'BUILDING_V8_SHARED',
-            'V8_SHARED',
-          ],
-        }],
       ],
     },
     {
@@ -1228,12 +1216,6 @@
         }, {
           'toolsets': ['target'],
         }],
-        ['component=="shared_library"', {
-          'defines': [
-            'BUILDING_V8_SHARED',
-            'V8_SHARED',
-          ],
-        }],
       ],
     },
     {