Add the ability to use a bundled Flapper.

This change needs more build-time support to actually make it happen.

Review URL: http://codereview.chromium.org/9406028

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

2 files changed, 30 insertions, 8 deletions

diff --git a/third_party/adobe/flash/flapper_version.h b/third_party/adobe/flash/flapper_version.h
new file mode 100644
index 0000000..c135ad5
--- /dev/null
+++ b/third_party/adobe/flash/flapper_version.h
@@ -0,0 +1,12 @@
+// This is a stand-in for a generated file that is available when Flapper is
+// available.
+
+#ifndef FLAPPER_VERSION_H_INCLUDED_
+#define FLAPPER_VERSION_H_INCLUDED_
+
+// If Flapper were available, we'd define two things:
+//  - FLAPPER_AVAILABLE (to indicate availability), and
+//  - FLAPPER_VERSION_STRING (with the version of the Flapper that's available
+//    as a string, e.g., "11.2.123.456").
+
+#endif  // FLAPPER_VERSION_H_INCLUDED_
diff --git a/third_party/adobe/flash/flash_player.gyp b/third_party/adobe/flash/flash_player.gyp
index 1d650f8..a443af9 100644
--- a/third_party/adobe/flash/flash_player.gyp
+++ b/third_party/adobe/flash/flash_player.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
 
@@ -15,13 +15,7 @@
             'destination': '<(PRODUCT_DIR)',
             'files': [],
             'conditions': [
-              [ 'chromeos == 1', {
-                'files': [
-                  'binaries/chromeos/libgcflashplayer.so',
-                  'binaries/linux/plugin.vch',
-                ]
-              }],
-              [ 'OS == "linux" and target_arch == "ia32" and chromeos == 0', {
+              [ 'OS == "linux" and target_arch == "ia32"', {
                 'files': [
                   'binaries/linux/libgcflashplayer.so',
                   'binaries/linux/plugin.vch',
@@ -46,5 +40,21 @@
         }],
       ],
     },
+    {
+      'target_name': 'flapper_version_h',
+      'type': 'none',
+      'copies': [{
+        'destination': '<(SHARED_INTERMEDIATE_DIR)',
+        'files': [],
+        'conditions': [
+          # TODO(viettrungluu): actually bring in the headers.
+          [ '1 == 1', {
+            'files': [
+              'flapper_version.h',  # The default, which indicates no Flapper.
+            ],
+          }],
+        ],
+      }],
+    },
   ],
 }