Merge 175820

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',
@@ skipping 123 matching lines @@
             'libraries': [
               '-llog',
             ],
           },
           'defines': [
             'USE_SYMBOLIZE',
           ],
           'sources!': [
             'debug/stack_trace_posix.cc',
           ],
+          'includes': [
+            '../build/android/cpufeatures.gypi',
+          ],
         }],
         ['OS == "android" and _toolset == "target" and android_build_type == 0', {
           'dependencies': [
             'base_java',
           ],
         }],
         ['os_bsd==1', {
           'include_dirs': [
             '/usr/local/include',
           ],
@@ skipping 857 matching lines @@
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/base/BuildInfo.java',
+            'android/java/src/org/chromium/base/CpuFeatures.java',
             'android/java/src/org/chromium/base/LocaleUtils.java',
             'android/java/src/org/chromium/base/PathService.java',
             'android/java/src/org/chromium/base/PathUtils.java',
             'android/java/src/org/chromium/base/SystemMessageHandler.java',
             'android/java/src/org/chromium/base/SystemMonitor.java',
           ],
           'variables': {
             'jni_gen_dir': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
@@ skipping 73 matching lines @@
             'base_unittests.isolate',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }