apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ifi…

base/base.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
     'base.gypi',
+    'test/android/native_test.gyp'

[bulach, 2012/03/23 10:30:48]

is it possible to make this include conditional?

[John Grabowski, 2012/03/24 01:59:18]

That isn't necessary and isn't the standard, just as win_precompile.gypi is not
conditionally included on Windows.

Note, however, that targets present in that file *are* conditional on Android.

   ],
   'targets': [
     {
       'target_name': 'base_i18n',
       'type': '<(component)',
       'variables': {
         'enable_wexit_time_destructors': 1,
         'optimize': 'max',
       },
       'dependencies': [
@@ skipping 124 matching lines @@
       'type': 'static_library',
       'dependencies': [
         'test_support_base',
       ],
       'sources': [
         'test/run_all_unittests.cc',
       ],
     },
     {
       'target_name': 'base_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'sources': [
         # Tests.
         'android/jni_android_unittest.cc',
         'android/scoped_java_ref_unittest.cc',
         'at_exit_unittest.cc',
         'atomicops_unittest.cc',
         'base64_unittest.cc',
         'bind_helpers_unittest.cc',
         'bind_unittest.cc',
         'bind_unittest.nc',
@@ skipping 482 matching lines @@
              # treated as weak imports in dependents, who still must
              # #include closure_blocks_leopard_compat.h to get weak imports.
              'type': 'none',
            }],
          ],
        },
      ],
    }],
   ],
 }