Chromecast: adds Android implementation of CastSysInfo.

chromecast/chromecast.gyp

 # Copyright 2014 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': {
     'android_support_v13_target%':
         '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
     'cast_build_release': 'internal/build/cast_build_release',
     'cast_is_debug_build%': 0,
@@ skipping 336 matching lines @@
       'dependencies': [
         'cast_public_api',
         '../base/base.gyp:base',
       ],
       'sources': [
         'base/cast_sys_info_util.h',
         'base/cast_sys_info_dummy.cc',
         'base/cast_sys_info_dummy.h',
       ],
       'conditions': [
-        ['chromecast_branding!="Chrome"', {
+        ['chromecast_branding!="Chrome" and OS!="android"', {
           'sources': [
             'base/cast_sys_info_util_simple.cc',
           ],
         }],
       ],
     },  # end of target 'cast_sys_info'
     {
       'target_name': 'cast_version_header',
       'type': 'none',
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)',
         ],
       },
       'actions': [
         {
           'action_name': 'version_header',
           'message': 'Generating version header file: <@(_outputs)',
           'inputs': [
             '<(version_path)',
-            'common/version.h.in',
+            'base/version.h.in',
           ],
           'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chromecast/common/version.h',
+            '<(SHARED_INTERMEDIATE_DIR)/chromecast/base/version.h',
           ],
           'action': [
             'python',
             '<(version_py_path)',
             '-e', 'VERSION_FULL="<(version_full)"',
             # CAST_BUILD_INCREMENTAL is taken from buildbot if available;
             # otherwise, a dev string is used.
             '-e', 'CAST_BUILD_INCREMENTAL="<!(echo ${CAST_BUILD_INCREMENTAL:="<!(date +%Y%m%d.%H%M%S)"})"',
             # CAST_BUILD_RELEASE is taken from cast_build_release file if exist;
             # otherwise, a dev string is used.
             '-e', 'CAST_BUILD_RELEASE="<!(if test -f <(cast_build_release); then cat <(cast_build_release); else echo eng.${USER}; fi)"',
             '-e', 'CAST_IS_DEBUG_BUILD=1 if "<(CONFIGURATION_NAME)" == "Debug" or <(cast_is_debug_build) == 1 else 0',
             '-e', 'CAST_PRODUCT_TYPE=<(cast_product_type)',
-            'common/version.h.in',
+            'base/version.h.in',
             '<@(_outputs)',
           ],
           'includes': [
             '../build/util/version.gypi',
           ],
         },
       ],
     },
   ],  # end of targets
 
@@ skipping 33 matching lines @@
             '../components/components.gyp:external_video_surface',
             '../content/content.gyp:content',
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gl/gl.gyp:gl',
           ],
           'include_dirs': [
             '../breakpad/src',
           ],
           'sources': [
+            'base/cast_sys_info_android.cc',
+            'base/cast_sys_info_android.h',
             'android/cast_jni_registrar.cc',
             'android/cast_jni_registrar.h',
             'android/cast_metrics_helper_android.cc',
             'android/cast_metrics_helper_android.h',
             'android/chromecast_config_android.cc',
             'android/chromecast_config_android.h',
             'android/platform_jni_loader.h',
             'app/android/cast_jni_loader.cc',
             'browser/android/cast_window_android.cc',
             'browser/android/cast_window_android.h',
@@ skipping 69 matching lines @@
             'additional_input_paths': ['<(PRODUCT_DIR)/assets/cast_shell.pak'],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'cast_jni_headers',
           'type': 'none',
           'sources': [
             'browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java',
+            'browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java',
             'browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/chromecast',
             ],
           },
           'variables': {
             'jni_gen_package': 'chromecast',
@@ skipping 95 matching lines @@
           'sources': [
             'graphics/cast_egl_platform_default.cc',
             'graphics/graphics_properties_default.cc',
             'graphics/osd_plane_default.cc'
           ],
         }
       ]
     }],
   ],  # end of conditions
 }