Update BUILD.gn and properly disable it on android

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

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

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

diff --git a/BUILD.gn b/BUILD.gn
index 2a6178eab07d11751e87f8de487945a16b2743bd..2420ecfbddb467b3a91f44d0c4422749957dc49e 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -239,6 +239,8 @@ source_set("v8_nosnapshot") {
     "src/snapshot-empty.cc",
   ]
 
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
   configs += [ ":internal_config", ":features" ]
 }
 
@@ -312,8 +314,6 @@ source_set("v8_base") {
     "src/dateparser-inl.h",
     "src/dateparser.cc",
     "src/dateparser.h",
-    "src/debug-agent.cc",
-    "src/debug-agent.h",
     "src/debug.cc",
     "src/debug.h",
     "src/deoptimizer.cc",
@@ -501,8 +501,6 @@ source_set("v8_base") {
     "src/platform/mutex.h",
     "src/platform/semaphore.cc",
     "src/platform/semaphore.h",
-    "src/platform/socket.cc",
-    "src/platform/socket.h",
     "src/preparse-data-format.h",
     "src/preparse-data.cc",
     "src/preparse-data.h",
@@ -712,7 +710,6 @@ source_set("v8_base") {
       "src/arm64/code-stubs-arm64.h",
       "src/arm64/constants-arm64.h",
       "src/arm64/cpu-arm64.cc",
-      "src/arm64/cpu-arm64.h",
       "src/arm64/debug-arm64.cc",
       "src/arm64/decoder-arm64.cc",
       "src/arm64/decoder-arm64.h",
@@ -780,6 +777,8 @@ source_set("v8_base") {
     ]
   }
 
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
   configs += [ ":internal_config", ":features" ]
 
   defines = []
@@ -846,7 +845,7 @@ source_set("v8_base") {
 # TODO(jochen): Remove this as soon as toolchain.gypi is integrated.
 if (build_cpu_arch != cpu_arch) {
 
-executable("mksnapshot") {
+source_set("mksnapshot") {
   sources = [
   ]
 }
@@ -858,6 +857,8 @@ executable("mksnapshot") {
     "src/mksnapshot.cc",
   ]
 
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
   configs += [ ":internal_config", ":features" ]
 
   deps = [