Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: BUILD.gn

Issue 2393603002: Revert of Turn libbase into a component (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | samples/samples.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 134f6a4450d9641aa5a744ba24f6fd255b5f1b88..46c412626bb14e0f9239fc6f1cd7fa29ae9a926a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -130,17 +130,6 @@
include_dirs = [ "include" ]
}
-# This config should be applied to code using the libbase.
-config("libbase_config") {
- if (is_component_build) {
- defines = [ "USING_V8_BASE_SHARED" ]
- }
- libs = []
- if (is_android && current_toolchain != host_toolchain) {
- libs += [ "log" ]
- }
-}
-
# This config should be applied to code using the libsampler.
config("libsampler_config") {
include_dirs = [ "include" ]
@@ -155,6 +144,10 @@
include_dirs = [ "include" ]
if (v8_enable_inspector_override) {
include_dirs += [ "$target_gen_dir/include" ]
+ }
+ libs = []
+ if (is_android && current_toolchain != host_toolchain) {
+ libs += [ "log" ]
}
}
@@ -2156,7 +2149,9 @@
}
}
-v8_component("v8_libbase") {
+v8_source_set("v8_libbase") {
+ visibility = [ ":*" ] # Only targets in this file can depend on this.
+
sources = [
"src/base/adapters.h",
"src/base/atomic-utils.h",
@@ -2172,7 +2167,6 @@
"src/base/atomicops_internals_x86_gcc.cc",
"src/base/atomicops_internals_x86_gcc.h",
"src/base/atomicops_internals_x86_msvc.h",
- "src/base/base-export.h",
"src/base/bits.cc",
"src/base/bits.h",
"src/base/build_config.h",
@@ -2223,13 +2217,7 @@
configs = [ ":internal_config_base" ]
- public_configs = [ ":libbase_config" ]
-
defines = []
-
- if (is_component_build) {
- defines = [ "BUILDING_V8_BASE_SHARED" ]
- }
if (is_posix) {
sources += [ "src/base/platform/platform-posix.cc" ]
@@ -2374,7 +2362,6 @@
]
public_deps = [
- ":v8_libbase",
":v8_libplatform",
]
}
@@ -2403,7 +2390,6 @@
deps = [
":v8_base",
- ":v8_libbase",
":v8_libplatform",
":v8_nosnapshot",
"//build/config/sanitizers:deps",
@@ -2526,7 +2512,6 @@
deps = [
":d8_js2c",
":v8",
- ":v8_libbase",
":v8_libplatform",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
@@ -2567,7 +2552,6 @@
deps = [
":v8",
- ":v8_libbase",
":v8_libplatform",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
@@ -2592,7 +2576,6 @@
deps = [
":v8",
- ":v8_libbase",
":v8_libplatform",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
@@ -2615,7 +2598,6 @@
]
deps = [
- ":v8_libbase",
":v8_libplatform",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
@@ -2659,7 +2641,6 @@
deps = [
":v8",
- ":v8_libbase",
":v8_libplatform",
"//build/config/sanitizers:deps",
"//build/win:default_exe_manifest",
« no previous file with comments | « no previous file | samples/samples.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698