Make base_unittests_apk actually work

build/config/BUILDCONFIG.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # =============================================================================
 # BUILD FLAGS
 # =============================================================================
 #
 # This block lists input arguments to the build, along with their default
 # values. GN requires listing them explicitly so it can validate input and have
@@ skipping 383 matching lines @@
 } else if (is_mac) {
   _executable_configs += [
     "//build/config/mac:mac_dynamic_flags",
     "//build/config/mac:mac_executable_flags" ]
 } else if (is_linux || is_android) {
   _executable_configs += [ "//build/config/gcc:executable_ldconfig" ]
 }
 set_defaults("executable") {
   configs = _executable_configs
 }
 set_defaults("test") {

[brettw, 2014/09/08 20:04:22]

I think you will need to update the default configs for tests in android to be
the shared library configs.

[cjhopman, 2014/09/09 16:55:32]

Done.

   configs = _executable_configs
 }
 
 # Static library defaults.
 set_defaults("static_library") {
   configs = _native_compiler_configs
 }
 
 # Shared library defaults (also for components in component mode).
 _shared_library_configs = _native_compiler_configs + [
@@ skipping 75 matching lines @@
 # ==============================================================================
 
 # TODO(brettw) erase this once the built-in "component" function is removed.
 if (is_component_build) {
   component_mode = "shared_library"
 } else {
   component_mode = "source_set"
 }
 
 template("component") {
+  # The sources assignment filter will have already been applied when the

[cjhopman, 2014/09/08 18:09:44]

I would prefer that we didn't allow variables set out here to leak into
target/template invocations (and instead required you to explicitly set them in
the scope of the invocation), but if we're going to allow it we might as well
take advantage of it.

brettw: wdyt?

[brettw, 2014/09/08 20:04:22]

I'd rather keep this the old way, maybe we can restrict the usage in the tool (I
agree with that this is confusing).

[cjhopman, 2014/09/09 16:55:32]

Done.

+  # code was originally executed. We don't want to apply it again, since
+  # the original target may have override it for some assignments.
+  set_sources_assignment_filter([])
+
+  if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
+  if (defined(invoker.cflags)) { cflags = invoker.cflags }
+  if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
+  if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
+  if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
+  if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
+  if (defined(invoker.data)) { data = invoker.data }
+  if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
+  if (defined(invoker.defines)) { defines = invoker.defines }
+  if (defined(invoker.deps)) { deps = invoker.deps }
+  if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
+  if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
+  if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
+  if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
+  if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
+  if (defined(invoker.libs)) { libs = invoker.libs }
+  if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
+  if (defined(invoker.output_name)) { output_name = invoker.output_name }
+  if (defined(invoker.public)) { public = invoker.public }
+  if (defined(invoker.sources)) { sources = invoker.sources }
+  if (defined(invoker.visibility)) { visibility = invoker.visibility }
   if (is_component_build) {
     shared_library(target_name) {
       # Configs will always be defined since we set_defaults for a component
       # above. We want to use those rather than whatever came with the nested
       # shared/static library inside the component.
       configs = []  # Prevent list overwriting warning.
       configs = invoker.configs
-
-      # The sources assignment filter will have already been applied when the
-      # code was originally executed. We don't want to apply it again, since
-      # the original target may have override it for some assignments.
-      set_sources_assignment_filter([])
-
-      if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
-      if (defined(invoker.cflags)) { cflags = invoker.cflags }
-      if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
-      if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
-      if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
-      if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
-      if (defined(invoker.data)) { data = invoker.data }
-      if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
-      if (defined(invoker.defines)) { defines = invoker.defines }
-      if (defined(invoker.deps)) { deps = invoker.deps }
-      if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
-      if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
-      if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
-      if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
-      if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
-      if (defined(invoker.libs)) { libs = invoker.libs }
-      if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
-      if (defined(invoker.output_name)) { output_name = invoker.output_name }
-      if (defined(invoker.public)) { public = invoker.public }
-      if (defined(invoker.sources)) { sources = invoker.sources }
-      if (defined(invoker.visibility)) { visibility = invoker.visibility }
     }
   } else {
     source_set(target_name) {
       # See above.
       configs = []  # Prevent list overwriting warning.
       configs = invoker.configs
-
-      # See above call.
-      set_sources_assignment_filter([])
-
-      if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
-      if (defined(invoker.cflags)) { cflags = invoker.cflags }
-      if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
-      if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
-      if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
-      if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
-      if (defined(invoker.data)) { data = invoker.data }
-      if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
-      if (defined(invoker.defines)) { defines = invoker.defines }
-      if (defined(invoker.deps)) { deps = invoker.deps }
-      if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
-      if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
-      if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
-      if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
-      if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
-      if (defined(invoker.libs)) { libs = invoker.libs }
-      if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
-      if (defined(invoker.output_name)) { output_name = invoker.output_name }
-      if (defined(invoker.public)) { public = invoker.public }
-      if (defined(invoker.sources)) { sources = invoker.sources }
-      if (defined(invoker.visibility)) { visibility = invoker.visibility }
     }
   }
 }
 
 # ==============================================================================
 # TEST SETUP
 # ==============================================================================
 
 # Define a test as an executable with the "testonly" flag set. In the future,
 # this will need to be enhanced for Android.
 template("test") {
-  executable(target_name) {
-    # Configs will always be defined since we set_defaults for a component
-    # above. We want to use those rather than whatever came with the nested
-    # shared/static library inside the component.
-    configs = []  # Prevent list overwriting warning.
-    configs = invoker.configs
+  # See above call.
+  set_sources_assignment_filter([])
 
-    testonly = true
+  if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
+  if (defined(invoker.cflags)) { cflags = invoker.cflags }
+  if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
+  if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
+  if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
+  if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
+  if (defined(invoker.data)) { data = invoker.data }
+  if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
+  if (defined(invoker.defines)) { defines = invoker.defines }
+  if (defined(invoker.deps)) { deps = invoker.deps }
+  if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
+  if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
+  if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
+  if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
+  if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
+  if (defined(invoker.libs)) { libs = invoker.libs }
+  if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
+  if (defined(invoker.output_name)) { output_name = invoker.output_name }
+  if (defined(invoker.public)) { public = invoker.public }
+  if (defined(invoker.sources)) { sources = invoker.sources }
+  if (defined(invoker.visibility)) { visibility = invoker.visibility }
 
-    # See above call.
-    set_sources_assignment_filter([])
+  testonly = true
 
-    if (defined(invoker.all_dependent_configs)) { all_dependent_configs = invoker.all_dependent_configs }
-    if (defined(invoker.cflags)) { cflags = invoker.cflags }
-    if (defined(invoker.cflags_c)) { cflags_c = invoker.cflags_c }
-    if (defined(invoker.cflags_cc)) { cflags_cc = invoker.cflags_cc }
-    if (defined(invoker.cflags_objc)) { cflags_objc = invoker.cflags_objc }
-    if (defined(invoker.cflags_objcc)) { cflags_objcc = invoker.cflags_objcc }
-    if (defined(invoker.data)) { data = invoker.data }
-    if (defined(invoker.datadeps)) { datadeps = invoker.datadeps }
-    if (defined(invoker.defines)) { defines = invoker.defines }
-    if (defined(invoker.deps)) { deps = invoker.deps }
-    if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs }
-    if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from }
-    if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs }
-    if (defined(invoker.ldflags)) { ldflags = invoker.ldflags }
-    if (defined(invoker.lib_dirs)) { lib_dirs = invoker.lib_dirs }
-    if (defined(invoker.libs)) { libs = invoker.libs }
-    if (defined(invoker.output_extension)) { output_extension = invoker.output_extension }
-    if (defined(invoker.output_name)) { output_name = invoker.output_name }
-    if (defined(invoker.public)) { public = invoker.public }
-    if (defined(invoker.sources)) { sources = invoker.sources }
-    if (defined(invoker.visibility)) { visibility = invoker.visibility }
+  if (is_android) {
+    shared_library(target_name) {
+      # Configs will always be defined since we set_defaults for a component
+      # above. We want to use those rather than whatever came with the nested
+      # shared/static library inside the component.
+      configs = []  # Prevent list overwriting warning.
+      configs = invoker.configs
+    }
+  } else {
+    executable(target_name) {
+      # Configs will always be defined since we set_defaults for a component
+      # above. We want to use those rather than whatever came with the nested
+      # shared/static library inside the component.
+      configs = []  # Prevent list overwriting warning.
+      configs = invoker.configs
+    }
   }
 }