Add nacl_loader_unittests to the chromium_builder_tests

Now nacl_loader target is built on all platforms. Also,
nacl_loader target was renamed to nacl_linux.

TEST=ninja -C out/Release chromium_builder_tests
TEST=GYP_DEFINES='disable_nacl=1' ./build/gyp_chromium \
     ninja -C out/Release chromium_builder_tests
TEST=trybots
BUG=364751
R=mseaborn@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266769 0039d316-1c4b-4281-b951-d872f2087c98

build/all.gyp

@@ -385,6 +385,11 @@
             '../ash/ash.gyp:ash_unittests',
           ],
         }],
+        ['disable_nacl==0', {
+          'dependencies': [
+            '../components/nacl.gyp:nacl_loader_unittests',
+          ],
+        }],
       ],
     }, # target_name: chromium_builder_tests
     {

components/components_tests.gyp

@@ -365,7 +365,7 @@
                 'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc',
               ],
               'dependencies': [
-                'nacl.gyp:nacl_loader',
+                'nacl.gyp:nacl_linux',
                 '../sandbox/sandbox.gyp:sandbox_linux_test_utils',
               ],
             }],

components/nacl.gyp

@@ -184,7 +184,33 @@
               '<@(nacl_defines)',
             ],
           },
-        }
+        },
+        {
+          'target_name': 'nacl_loader_unittests',
+          'type': '<(gtest_target_type)',
+          'sources': [
+            'nacl/loader/run_all_unittests.cc',
+          ],
+          'dependencies': [
+            'nacl',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'conditions': [
+            ['OS=="linux"', {
+              'sources': [
+                # TODO(hamaji): Currently, we build them twice. Stop building
+                # them for components_unittests. See crbug.com/364751
+                'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc',
+                'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc',
+              ],
+              'dependencies': [
+                'nacl_linux',
+                '../sandbox/sandbox.gyp:sandbox_linux_test_utils',
+              ],
+            }],
+          ],
+        },
       ],
       'conditions': [
         ['OS=="linux"', {
@@ -200,7 +226,7 @@
                 'nacl/loader/nacl_helper_linux.h',
               ],
               'dependencies': [
-                'nacl_loader',
+                'nacl_linux',
               ],
               'cflags': ['-fPIE'],
               'ldflags!': [
@@ -213,7 +239,7 @@
                 'ldflags': ['-pie'],
               },
             }, {
-              'target_name': 'nacl_loader',
+              'target_name': 'nacl_linux',
               'type': 'static_library',
               'include_dirs': [
                 '..',
@@ -291,22 +317,6 @@
                 }],
               ],
               'cflags': ['-fPIE'],
-            }, {
-              'target_name': 'nacl_loader_unittests',
-              'type': '<(gtest_target_type)',
-              'sources': [
-                # TODO(hamaji): Currently, we build them twice. Stop building
-                # them for components_unittests. See crbug.com/364751
-                'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc',
-                'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc',
-                'nacl/loader/run_all_unittests.cc',
-              ],
-              'dependencies': [
-                'nacl_loader',
-                '../base/base.gyp:test_support_base',
-                '../sandbox/sandbox.gyp:sandbox_linux_test_utils',
-                '../testing/gtest.gyp:gtest',
-              ],
             },
           ],
         }],