Index: base/BUILD.gn |
diff --git a/base/BUILD.gn b/base/BUILD.gn |
index 6ebec967b9ab2e76bf487171c074ccce0c0c581b..d5b815d207a85f98da84aba2243da59f3c8291c7 100644 |
--- a/base/BUILD.gn |
+++ b/base/BUILD.gn |
@@ -109,21 +109,14 @@ config("android_system_libs") { |
# to be linked in where they wouldn't have otherwise. This does not include |
# test code (test support and anything in the test directory) which should use |
# source_set as is recommended for GN targets). |
-if (is_component_build) { |
- base_target_type = "shared_library" |
-} else { |
+component("base") { |
# TODO(phosek) bug 570839: If field_trial.cc is in a static library, |
# hacl_helper_nonsfi doesn't link properly on Linux in debug builds. The |
# reasons for this seem to involve obscure toolchain bugs. This should be |
# fixed and this target should always be a static_library in the |
# non-component case. |
- if (is_nacl_nonsfi) { |
- base_target_type = "source_set" |
- } else { |
- base_target_type = "static_library" |
- } |
-} |
-target(base_target_type, "base") { |
+ component_never_use_source_set = !is_nacl_nonsfi |
+ |
sources = [ |
"allocator/allocator_extension.cc", |
"allocator/allocator_extension.h", |