Change the way inputs are specified in the gears sconscripts. This will make

it easier to share inputs among files, in preparation for the symbian port.

Also, some small fixes:
- Added a hack to the third party lib scripts to place the libraries in the
  right directory.  Normally SCons does this, but fails due to a bug when
  COMPONENT_LIBRARY_DIR is changed.
- Added fake notifier targets to make the win32 installer happy.
- Added NPAPI's gears.dll to the win32 installer dependencies, so it is built (even though it isn't used by the installer).
- Added symbian file to sqlite compile.
Review URL: http://codereview.chromium.org/9657

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

1 files changed, 12 insertions, 0 deletions

diff --git a/gears/SConscript b/gears/SConscript
index 26e3603..0811393 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -38,6 +38,7 @@ env = env.Clone(
     OPEN_DIR = "gears",
     THIRD_PARTY_DIR = "third_party",
     PRIVATE_THIRD_PARTY_DIR = "third_party_internal",
+    SYMBIAN_DIR = "symbian_internal",
 )
 
 if not os.path.exists(env.Dir('#/$OPEN_DIR').abspath):
@@ -60,6 +61,7 @@ os_browsers_map = {
     'linux': ['FF2', 'FF3'],
     'osx': ['SF', 'FF2', 'FF3'],
     'android': ['NPAPI'],
+    'symbian': ['NPAPI'],
 }
 
 vars = Variables(None, ARGUMENTS)
@@ -696,6 +698,16 @@ env.Append(SHLINKFLAGS = ['$LINKFLAGS'])
 if env['OS'] in ['wince', 'win32']:
   env.Append(SHLINKFLAGS = ['/DLL'])
 
+# Custom builder to work around a scons and/or hammer bug.  ComponentLibrary
+# tries to install the library to COMPONENT_LIBRARY_DIR, but since we overrode
+# that value, scons gets confused.  I'm not sure who is at fault here.
+# See http://code.google.com/p/chromium/issues/detail?id=4177.
+def GearsStaticLibrary(env, *args, **kw):
+  lib = env.ChromeStaticLibrary(*args, **kw)
+  env.Install('$COMPONENT_LIBRARY_DIR', lib[0])
+  return lib
+env.AddMethod(GearsStaticLibrary)
+
 # Load all the components
 
 sconscripts = [